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

feat(content): fruit products (jam, juice, cooked) will inherit name from component used #4737

Merged
merged 9 commits into from
Jun 4, 2024
+452 −180
Merged

feat(content): fruit products (jam, juice, cooked) will inherit name from component used #4737

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3fc3d43
not irradiated
Lamandus Jun 4, 2024
2b43dfe
added named pies, canned and waffles
Lamandus Jun 4, 2024
4065523
and cookies!
Lamandus Jun 4, 2024
d6c7a6b
style(autofix.ci): automated formatting
autofix-ci[bot] Jun 4, 2024
54a196e
and kompot
Lamandus Jun 4, 2024
7689153
and granola
Lamandus Jun 4, 2024
82f4f9c
Merge branch 'jam-fruit' of https://github.com/Lamandus/Cataclysm-BN …
Lamandus Jun 4, 2024
b2a084c
and fruit slice
Lamandus Jun 4, 2024
8d334f6
and milkshake
Lamandus Jun 4, 2024
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
34 changes: 32 additions & 2 deletions data/json/items/comestibles/drink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@
{
"type": "COMESTIBLE",
"id": "cranberry_juice",
"//": "should not be obsoleted together with its recipe, because generic juice spawns as juice.",
"name": "cranberry juice",
"weight": "250 g",
"color": "magenta",
Expand Down Expand Up @@ -532,7 +533,35 @@
{
"type": "COMESTIBLE",
"id": "juice",
"name": "fruit juice",
"name": "juice",
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "apple", "name": { "str_sp": "apple %s" } },
{ "type": "COMPONENT_ID", "condition": "apricot", "name": { "str_sp": "apricot %s" } },
{ "type": "COMPONENT_ID", "condition": "banana", "name": { "str_sp": "banana %s" } },
{ "type": "COMPONENT_ID", "condition": "blackberries", "name": { "str_sp": "blackberry %s" } },
{ "type": "COMPONENT_ID", "condition": "blueberries", "name": { "str_sp": "blueberry %s" } },
{ "type": "COMPONENT_ID", "condition": "cherries", "name": { "str_sp": "cherry %s" } },
{ "type": "COMPONENT_ID", "condition": "cranberries", "name": { "str_sp": "cranberry %s" } },
{ "type": "COMPONENT_ID", "condition": "grapefruit", "name": { "str_sp": "grapefruit %s" } },
{ "type": "COMPONENT_ID", "condition": "grapes", "name": { "str_sp": "grape %s" } },
{ "type": "COMPONENT_ID", "condition": "kiwi", "name": { "str_sp": "kiwi %s" } },
{ "type": "COMPONENT_ID", "condition": "mango", "name": { "str_sp": "mango %s" } },
{ "type": "COMPONENT_ID", "condition": "melon", "name": { "str_sp": "melon %s" } },
{ "type": "COMPONENT_ID", "condition": "orange", "name": { "str_sp": "orange %s" } },
{ "type": "COMPONENT_ID", "condition": "papaya", "name": { "str_sp": "papaya %s" } },
{ "type": "COMPONENT_ID", "condition": "peach", "name": { "str_sp": "peach %s" } },
{ "type": "COMPONENT_ID", "condition": "pear", "name": { "str_sp": "pear %s" } },
{ "type": "COMPONENT_ID", "condition": "pineapple", "name": { "str_sp": "pineapple %s" } },
{ "type": "COMPONENT_ID", "condition": "plums", "name": { "str_sp": "plum %s" } },
{ "type": "COMPONENT_ID", "condition": "pomegranate", "name": { "str_sp": "pomegranate %s" } },
{ "type": "COMPONENT_ID", "condition": "raspberries", "name": { "str_sp": "raspberry %s" } },
{ "type": "COMPONENT_ID", "condition": "rose_hips", "name": { "str_sp": "rose_hip %s" } },
{ "type": "COMPONENT_ID", "condition": "strawberries", "name": { "str_sp": "strawberry %s" } },
{ "type": "COMPONENT_ID", "condition": "huckleberries", "name": { "str_sp": "huckleberry %s" } },
{ "type": "COMPONENT_ID", "condition": "mulberries", "name": { "str_sp": "mulberry %s" } },
{ "type": "COMPONENT_ID", "condition": "elderberries", "name": { "str_sp": "elderberry %s" } },
{ "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
],
"weight": "125 g",
"color": "light_red",
"spoils_in": "5 days",
Expand Down Expand Up @@ -761,6 +790,7 @@
{
"type": "COMESTIBLE",
"id": "oj",
"//": "should not be obsoleted together with its recipe, because generic juice spawns as juice.",
"name": "orange juice",
"weight": "263 g",
"color": "yellow",
Expand All @@ -779,7 +809,7 @@
"volume": "250 ml",
"phase": "liquid",
"flags": [ "EATEN_COLD" ],
"//": "most store-bought oj is fortified with calcium.",
"//2": "most store-bought oj is fortified with calcium.",
"vitamins": [ [ "vitA", 2 ], [ "vitC", 146 ], [ "calcium", 28 ], [ "iron", 2 ] ],
"fun": 3
},
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/comestibles/egg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,11 @@
"id": "boiled_egg_condiment",
"name": { "str": "boiled egg with condiment" },
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "ketchup", "name": "boiled egg with ketchup" },
{ "type": "COMPONENT_ID", "condition": "mayonnaise", "name": "boiled egg with mayonnaise" },
{ "type": "COMPONENT_ID", "condition": "mustard", "name": "boiled egg with mustard" },
{ "type": "COMPONENT_ID", "condition": "horseradish", "name": "boiled egg with horseradish" },
{ "type": "COMPONENT_ID", "condition": "salt", "name": "salted boiled egg" }
{ "type": "COMPONENT_ID", "condition": "ketchup", "name": { "str": "%s with ketchup" } },
{ "type": "COMPONENT_ID", "condition": "mayonnaise", "name": { "str": "%s with mayonnaise" } },
{ "type": "COMPONENT_ID", "condition": "mustard", "name": { "str": "%s with mustard" } },
{ "type": "COMPONENT_ID", "condition": "horseradish", "name": { "str": "%s with horseradish" } },
{ "type": "COMPONENT_ID", "condition": "salt", "name": { "str": "salted boiled egg" } }
],
"copy-from": "boiled_egg",
"quench": 0,
Expand Down
114 changes: 113 additions & 1 deletion data/json/items/comestibles/fruit_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,34 @@
"type": "COMESTIBLE",
"id": "fruit_leather",
"name": "fruit leather",
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "apple", "name": { "str_sp": "apple %s" } },
{ "type": "COMPONENT_ID", "condition": "apricot", "name": { "str_sp": "apricot %s" } },
{ "type": "COMPONENT_ID", "condition": "banana", "name": { "str_sp": "banana %s" } },
{ "type": "COMPONENT_ID", "condition": "blackberries", "name": { "str_sp": "blackberry %s" } },
{ "type": "COMPONENT_ID", "condition": "blueberries", "name": { "str_sp": "blueberry %s" } },
{ "type": "COMPONENT_ID", "condition": "cherries", "name": { "str_sp": "cherry %s" } },
{ "type": "COMPONENT_ID", "condition": "cranberries", "name": { "str_sp": "cranberry %s" } },
{ "type": "COMPONENT_ID", "condition": "grapefruit", "name": { "str_sp": "grapefruit %s" } },
{ "type": "COMPONENT_ID", "condition": "grapes", "name": { "str_sp": "grape %s" } },
{ "type": "COMPONENT_ID", "condition": "kiwi", "name": { "str_sp": "kiwi %s" } },
{ "type": "COMPONENT_ID", "condition": "mango", "name": { "str_sp": "mango %s" } },
{ "type": "COMPONENT_ID", "condition": "melon", "name": { "str_sp": "melon %s" } },
{ "type": "COMPONENT_ID", "condition": "orange", "name": { "str_sp": "orange %s" } },
{ "type": "COMPONENT_ID", "condition": "papaya", "name": { "str_sp": "papaya %s" } },
{ "type": "COMPONENT_ID", "condition": "peach", "name": { "str_sp": "peach %s" } },
{ "type": "COMPONENT_ID", "condition": "pear", "name": { "str_sp": "pear %s" } },
{ "type": "COMPONENT_ID", "condition": "pineapple", "name": { "str_sp": "pineapple %s" } },
{ "type": "COMPONENT_ID", "condition": "plums", "name": { "str_sp": "plum %s" } },
{ "type": "COMPONENT_ID", "condition": "pomegranate", "name": { "str_sp": "pomegranate %s" } },
{ "type": "COMPONENT_ID", "condition": "raspberries", "name": { "str_sp": "raspberry %s" } },
{ "type": "COMPONENT_ID", "condition": "rose_hips", "name": { "str_sp": "rose_hip %s" } },
{ "type": "COMPONENT_ID", "condition": "strawberries", "name": { "str_sp": "strawberry %s" } },
{ "type": "COMPONENT_ID", "condition": "huckleberries", "name": { "str_sp": "huckleberry %s" } },
{ "type": "COMPONENT_ID", "condition": "mulberries", "name": { "str_sp": "mulberry %s" } },
{ "type": "COMPONENT_ID", "condition": "elderberries", "name": { "str_sp": "elderberry %s" } },
{ "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
],
"weight": "34 g",
"color": "pink",
"container": "bag_plastic",
Expand Down Expand Up @@ -123,6 +151,34 @@
"type": "COMESTIBLE",
"id": "fruit_cooked",
"name": "cooked fruit",
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "apple", "name": "cooked apple" },
{ "type": "COMPONENT_ID", "condition": "apricot", "name": "cooked apricot" },
{ "type": "COMPONENT_ID", "condition": "banana", "name": "cooked banana" },
{ "type": "COMPONENT_ID", "condition": "blackberries", "name": "cooked blackberry" },
{ "type": "COMPONENT_ID", "condition": "blueberries", "name": "cooked blueberry" },
{ "type": "COMPONENT_ID", "condition": "cherries", "name": "cooked cherry" },
{ "type": "COMPONENT_ID", "condition": "cranberries", "name": "cooked cranberry" },
{ "type": "COMPONENT_ID", "condition": "grapefruit", "name": "cooked grapefruit" },
{ "type": "COMPONENT_ID", "condition": "grapes", "name": "cooked grape" },
{ "type": "COMPONENT_ID", "condition": "kiwi", "name": "cooked kiwi" },
{ "type": "COMPONENT_ID", "condition": "mango", "name": "cooked mango" },
{ "type": "COMPONENT_ID", "condition": "melon", "name": "cooked melon" },
{ "type": "COMPONENT_ID", "condition": "orange", "name": "cooked orange" },
{ "type": "COMPONENT_ID", "condition": "papaya", "name": "cooked papaya" },
{ "type": "COMPONENT_ID", "condition": "peach", "name": "cooked peach" },
{ "type": "COMPONENT_ID", "condition": "pear", "name": "cooked pear" },
{ "type": "COMPONENT_ID", "condition": "pineapple", "name": "cooked pineapple" },
{ "type": "COMPONENT_ID", "condition": "plums", "name": "cooked plum" },
{ "type": "COMPONENT_ID", "condition": "pomegranate", "name": "cooked pomegranate" },
{ "type": "COMPONENT_ID", "condition": "raspberries", "name": "cooked raspberry" },
{ "type": "COMPONENT_ID", "condition": "rose_hips", "name": "cooked rose_hip" },
{ "type": "COMPONENT_ID", "condition": "strawberries", "name": "cooked strawberry" },
{ "type": "COMPONENT_ID", "condition": "huckleberries", "name": "cooked huckleberry" },
{ "type": "COMPONENT_ID", "condition": "mulberries", "name": "cooked mulberry" },
{ "type": "COMPONENT_ID", "condition": "elderberries", "name": "cooked elderberry" },
{ "type": "COMPONENT_ID", "condition": "watermelon", "name": "cooked watermelon" }
],
"weight": "150 g",
"color": "red",
"spoils_in": "3 days 18 hours",
Expand All @@ -144,7 +200,35 @@
{
"type": "COMESTIBLE",
"id": "jam_fruit",
"name": "fruit jam",
"name": { "str_sp": "jam" },
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "apple", "name": { "str_sp": "apple %s" } },
{ "type": "COMPONENT_ID", "condition": "apricot", "name": { "str_sp": "apricot %s" } },
{ "type": "COMPONENT_ID", "condition": "banana", "name": { "str_sp": "banana %s" } },
{ "type": "COMPONENT_ID", "condition": "blackberries", "name": { "str_sp": "blackberry %s" } },
{ "type": "COMPONENT_ID", "condition": "blueberries", "name": { "str_sp": "blueberry %s" } },
{ "type": "COMPONENT_ID", "condition": "cherries", "name": { "str_sp": "cherry %s" } },
{ "type": "COMPONENT_ID", "condition": "cranberries", "name": { "str_sp": "cranberry %s" } },
{ "type": "COMPONENT_ID", "condition": "grapefruit", "name": { "str_sp": "grapefruit %s" } },
{ "type": "COMPONENT_ID", "condition": "grapes", "name": { "str_sp": "grape %s" } },
{ "type": "COMPONENT_ID", "condition": "kiwi", "name": { "str_sp": "kiwi %s" } },
{ "type": "COMPONENT_ID", "condition": "mango", "name": { "str_sp": "mango %s" } },
{ "type": "COMPONENT_ID", "condition": "melon", "name": { "str_sp": "melon %s" } },
{ "type": "COMPONENT_ID", "condition": "orange", "name": { "str_sp": "orange %s" } },
{ "type": "COMPONENT_ID", "condition": "papaya", "name": { "str_sp": "papaya %s" } },
{ "type": "COMPONENT_ID", "condition": "peach", "name": { "str_sp": "peach %s" } },
{ "type": "COMPONENT_ID", "condition": "pear", "name": { "str_sp": "pear %s" } },
{ "type": "COMPONENT_ID", "condition": "pineapple", "name": { "str_sp": "pineapple %s" } },
{ "type": "COMPONENT_ID", "condition": "plums", "name": { "str_sp": "plum %s" } },
{ "type": "COMPONENT_ID", "condition": "pomegranate", "name": { "str_sp": "pomegranate %s" } },
{ "type": "COMPONENT_ID", "condition": "raspberries", "name": { "str_sp": "raspberry %s" } },
{ "type": "COMPONENT_ID", "condition": "rose_hips", "name": { "str_sp": "rose_hip %s" } },
{ "type": "COMPONENT_ID", "condition": "strawberries", "name": { "str_sp": "strawberry %s" } },
{ "type": "COMPONENT_ID", "condition": "huckleberries", "name": { "str_sp": "huckleberry %s" } },
{ "type": "COMPONENT_ID", "condition": "mulberries", "name": { "str_sp": "mulberry %s" } },
{ "type": "COMPONENT_ID", "condition": "elderberries", "name": { "str_sp": "elderberry %s" } },
{ "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
],
"weight": "15 g",
"color": "red",
"spoils_in": "10 days",
Expand Down Expand Up @@ -226,6 +310,34 @@
"type": "COMESTIBLE",
"id": "apple_canned",
"name": { "str_sp": "canned fruit" },
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "apple", "name": "canned apple" },
{ "type": "COMPONENT_ID", "condition": "apricot", "name": "canned apricot" },
{ "type": "COMPONENT_ID", "condition": "banana", "name": "canned banana" },
{ "type": "COMPONENT_ID", "condition": "blackberries", "name": "canned blackberry" },
{ "type": "COMPONENT_ID", "condition": "blueberries", "name": "canned blueberry" },
{ "type": "COMPONENT_ID", "condition": "cherries", "name": "canned cherry" },
{ "type": "COMPONENT_ID", "condition": "cranberries", "name": "canned cranberry" },
{ "type": "COMPONENT_ID", "condition": "grapefruit", "name": "canned grapefruit" },
{ "type": "COMPONENT_ID", "condition": "grapes", "name": "canned grape" },
{ "type": "COMPONENT_ID", "condition": "kiwi", "name": "canned kiwi" },
{ "type": "COMPONENT_ID", "condition": "mango", "name": "canned mango" },
{ "type": "COMPONENT_ID", "condition": "melon", "name": "canned melon" },
{ "type": "COMPONENT_ID", "condition": "orange", "name": "canned orange" },
{ "type": "COMPONENT_ID", "condition": "papaya", "name": "canned papaya" },
{ "type": "COMPONENT_ID", "condition": "peach", "name": "canned peach" },
{ "type": "COMPONENT_ID", "condition": "pear", "name": "canned pear" },
{ "type": "COMPONENT_ID", "condition": "pineapple", "name": "canned pineapple" },
{ "type": "COMPONENT_ID", "condition": "plums", "name": "canned plum" },
{ "type": "COMPONENT_ID", "condition": "pomegranate", "name": "canned pomegranate" },
{ "type": "COMPONENT_ID", "condition": "raspberries", "name": "canned raspberry" },
{ "type": "COMPONENT_ID", "condition": "rose_hips", "name": "canned rose_hip" },
{ "type": "COMPONENT_ID", "condition": "strawberries", "name": "canned strawberry" },
{ "type": "COMPONENT_ID", "condition": "huckleberries", "name": "canned huckleberry" },
{ "type": "COMPONENT_ID", "condition": "mulberries", "name": "canned mulberry" },
{ "type": "COMPONENT_ID", "condition": "elderberries", "name": "canned elderberry" },
{ "type": "COMPONENT_ID", "condition": "watermelon", "name": "canned watermelon" }
],
"weight": "170 g",
"color": "red",
"spoils_in": "7 days 12 hours",
Expand Down
28 changes: 28 additions & 0 deletions data/json/items/comestibles/junkfood.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,34 @@
"type": "COMESTIBLE",
"id": "cookies",
"name": "cookie",
"conditional_names": [
Lamandus marked this conversation as resolved.
Show resolved Hide resolved
{ "type": "COMPONENT_ID", "condition": "apple", "name":"apple %s" },
{ "type": "COMPONENT_ID", "condition": "apricot", "name":"apricot %s" },
{ "type": "COMPONENT_ID", "condition": "banana", "name":"banana %s" },
{ "type": "COMPONENT_ID", "condition": "blackberries", "name":"blackberry %s" },
{ "type": "COMPONENT_ID", "condition": "blueberries", "name":"blueberry %s" },
{ "type": "COMPONENT_ID", "condition": "cherries", "name":"cherry %s" },
{ "type": "COMPONENT_ID", "condition": "cranberries", "name":"cranberry %s" },
{ "type": "COMPONENT_ID", "condition": "grapefruit", "name":"grapefruit %s" },
{ "type": "COMPONENT_ID", "condition": "grapes", "name":"grape %s" },
{ "type": "COMPONENT_ID", "condition": "kiwi", "name":"kiwi %s" },
{ "type": "COMPONENT_ID", "condition": "mango", "name":"mango %s" },
{ "type": "COMPONENT_ID", "condition": "melon", "name":"melon %s" },
{ "type": "COMPONENT_ID", "condition": "orange", "name":"orange %s" },
{ "type": "COMPONENT_ID", "condition": "papaya", "name":"papaya %s" },
{ "type": "COMPONENT_ID", "condition": "peach", "name":"peach %s" },
{ "type": "COMPONENT_ID", "condition": "pear", "name":"pear %s" },
{ "type": "COMPONENT_ID", "condition": "pineapple", "name":"pineapple %s" },
{ "type": "COMPONENT_ID", "condition": "plums", "name":"plum %s" },
{ "type": "COMPONENT_ID", "condition": "pomegranate", "name":"pomegranate %s" },
{ "type": "COMPONENT_ID", "condition": "raspberries", "name":"raspberry %s" },
{ "type": "COMPONENT_ID", "condition": "rose_hips", "name":"rose_hip %s" },
{ "type": "COMPONENT_ID", "condition": "strawberries", "name":"strawberry %s" },
{ "type": "COMPONENT_ID", "condition": "huckleberries", "name":"huckleberry %s" },
{ "type": "COMPONENT_ID", "condition": "mulberries", "name":"mulberry %s" },
{ "type": "COMPONENT_ID", "condition": "elderberries", "name":"elderberry %s" },
{ "type": "COMPONENT_ID", "condition": "watermelon", "name":"watermelon %s" }
],
"weight": "33 g",
"color": "brown",
"container": "box_small",
Expand Down
Loading
Loading