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

Added Gelatin and Several Gelatin Based Recipes #47080

Merged
merged 23 commits into from
Feb 18, 2021
Merged

Added Gelatin and Several Gelatin Based Recipes #47080

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f666ed1
added gelatin items and recipes to craft them, added 4 flavors of gel…
grawprog Jan 27, 2021
25c6d57
merged files
grawprog Jan 28, 2021
76e0195
Finished recipes for gelatin and gummy candies. Added Vegan variants …
grawprog Jan 28, 2021
4c45d8b
added agar as alternative in aspic recipe
grawprog Jan 28, 2021
d115108
fixed mistake
grawprog Jan 28, 2021
fc57134
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
8da8420
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
1225269
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
f2391d2
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
f1a7fa1
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
1b26b42
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
db471be
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
0929bb8
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
984dc6b
Update data/json/requirements/cooking_components.json
grawprog Jan 28, 2021
55376e9
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
152be2a
Update data/json/recipes/food/other.json
grawprog Jan 28, 2021
33334a0
Update data/json/recipes/food/other.json
BrettDong Jan 28, 2021
1ce4cd0
Merge https://github.com/CleverRaven/Cataclysm-DDA
grawprog Jan 29, 2021
c0a9e95
Tried using snippets to condense the flavours. This ended up leading…
grawprog Jan 29, 2021
add5285
Fixed grammar errors in descriptions.
grawprog Jan 29, 2021
ba4fb32
adjusted recipes to not use thousands of calories worth of ingredients.
grawprog Jan 30, 2021
1ccae02
Merge https://github.com/CleverRaven/Cataclysm-DDA
grawprog Jan 30, 2021
5a8b406
fixed errors with calories in recipes.
grawprog Jan 30, 2021
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
15 changes: 13 additions & 2 deletions data/json/itemgroups/Food/food.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@
{ "item": "dry_beans", "prob": 40 },
{ "item": "dry_lentils", "prob": 30 },
{ "item": "dry_rice", "prob": 40 },
{ "item": "freeze_dried_meal", "prob": 10 }
{ "item": "freeze_dried_meal", "prob": 10 },
{ "item": "gelatin_powder", "prob": 40 },
{ "item": "chem_agar", "prob": 15 },
{ "item": "gelatin_dessert_powder_cherry", "prob": 40 },
{ "item": "gelatin_dessert_powder_lime", "prob": 40 },
{ "item": "gelatin_dessert_powder_grape", "prob": 40 },
{ "item": "gelatin_dessert_powder_raspberry", "prob": 40 }
]
},
{
Expand Down Expand Up @@ -426,6 +432,7 @@
{ "item": "candy", "prob": 70 },
{ "item": "candy2", "prob": 70 },
{ "item": "candy3", "prob": 70 },
{ "item": "candy4", "prob": 70 },
{ "item": "cow_candy", "prob": 20 },
{ "item": "maltballs", "prob": 60 },
{ "item": "mintpatties", "prob": 60 },
Expand Down Expand Up @@ -553,7 +560,11 @@
{ "item": "pie", "prob": 20 },
{ "item": "pie_veggy", "prob": 18 },
{ "item": "pie_meat", "prob": 18 },
{ "item": "pie_maple", "prob": 9 }
{ "item": "pie_maple", "prob": 9 },
{ "item": "gelatin_dessert_cherry", "prob": 40 },
{ "item": "gelatin_dessert_lime", "prob": 40 },
{ "item": "gelatin_dessert_grape", "prob": 40 },
{ "item": "gelatin_dessert_raspberry", "prob": 40 }
]
},
{
Expand Down
16 changes: 16 additions & 0 deletions data/json/itemgroups/SUS/fridges.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
{ "item": "yoghurt", "prob": 80 },
{ "item": "butter", "prob": 80 },
{ "item": "pudding", "prob": 30 },
{ "item": "gelatin_dessert_cherry", "prob": 20 },
{ "item": "gelatin_dessert_lime", "prob": 20 },
{ "item": "gelatin_dessert_grape", "prob": 20 },
{ "item": "gelatin_dessert_raspberry", "prob": 20 },
{ "item": "egg_bird_unfert", "prob": 85, "count-min": 1, "count-max": 12 },
{ "item": "egg_bird_unfert", "prob": 85, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" },
{ "item": "bacon", "prob": 25 },
{
Expand Down Expand Up @@ -520,6 +525,8 @@
{ "item": "onion_rings", "charges-min": 1, "prob": 10 },
{ "item": "pizza_veggy", "charges-min": 1, "prob": 20 },
{ "item": "nachosv", "charges-min": 1, "prob": 20 },
{ "item": "gelatin_dessert_vegan", "prob": 30 },
{ "item": "gelatin_dessert_vegan_fruit", "prob": 30 },
{
"distribution": [
{
Expand Down Expand Up @@ -623,6 +630,11 @@
{ "item": "yoghurt", "prob": 20 },
{ "item": "butter", "prob": 20 },
{ "item": "pudding", "prob": 20 },
{ "item": "gelatin_dessert_cherry", "prob": 10 },
{ "item": "gelatin_dessert_lime", "prob": 10 },
{ "item": "gelatin_dessert_grape", "prob": 10 },
{ "item": "gelatin_dessert_raspberry", "prob": 10 },
{ "item": "egg_bird_unfert", "prob": 20, "count-min": 1, "count-max": 12 },
{ "item": "egg_bird_unfert", "prob": 20, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" },
{ "item": "bacon", "prob": 25 },
{
Expand Down Expand Up @@ -880,6 +892,10 @@
{ "item": "yoghurt", "count": [ 1, 3 ], "prob": 75 },
{ "item": "butter", "prob": 50 },
{ "item": "pudding", "prob": 30 },
{ "item": "gelatin_dessert_cherry", "prob": 10 },
{ "item": "gelatin_dessert_lime", "prob": 10 },
{ "item": "gelatin_dessert_grape", "prob": 10 },
{ "item": "gelatin_dessert_raspberry", "prob": 10 },
{ "item": "veggy_salad", "charges-min": 1, "prob": 19 },
{ "item": "blt", "charges-min": 1, "prob": 13 },
{ "item": "protein_shake", "charges-min": 1, "prob": 6 },
Expand Down
8 changes: 8 additions & 0 deletions data/json/itemgroups/collections_domestic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,10 @@
{ "item": "noodles_fast", "prob": 30 },
{ "item": "ravioli", "prob": 25 },
{ "item": "sauce_red", "prob": 20 },
{ "item": "gelatin_dessert_powder_cherry", "prob": 20 },
{ "item": "gelatin_dessert_powder_lime", "prob": 20 },
{ "item": "gelatin_dessert_powder_grape", "prob": 20 },
{ "item": "gelatin_dessert_powder_raspberry", "prob": 20 },
{ "item": "sauce_pesto", "prob": 15 },
{ "item": "bread", "prob": 14 },
{ "item": "cornbread", "prob": 7 },
Expand All @@ -579,6 +583,10 @@
{ "item": "can_cheese", "prob": 8 },
{ "item": "yoghurt", "prob": 8 },
{ "item": "pudding", "prob": 10 },
{ "item": "gelatin_dessert_cherry", "prob": 10 },
{ "item": "gelatin_dessert_lime", "prob": 10 },
{ "item": "gelatin_dessert_grape", "prob": 10 },
{ "item": "gelatin_dessert_raspberry", "prob": 10 },
{ "item": "veggy_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
{ "item": "sauerkraut", "prob": 5, "charges": 4, "container-item": "jar_glass_sealed" },
{ "item": "meat_pickled", "prob": 4, "charges": 2, "container-item": "jar_glass_sealed" },
Expand Down
189 changes: 189 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 @@ -316,6 +316,48 @@
"charges": 3,
"fun": 3
},
{
"type": "COMESTIBLE",
"id": "candy4",
"name": { "str_sp": "gummy candy" },
"weight": "46 g",
"color": "yellow",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"healthy": -1,
"calories": 85,
"description": "A handful of colorful fruit and soda pop flavored gummy candies.",
"price": 180,
"price_postapoc": 200,
"material": [ "junk", "flesh" ],
"volume": "90 ml",
"flags": [ "EDIBLE_FROZEN" ],
"charges": 3,
"fun": 5
},
{
"type": "COMESTIBLE",
"id": "candy5",
"name": { "str_sp": "gummy candy" },
"weight": "46 g",
"color": "light_green",
"spoils_in": "360 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"healthy": -1,
"calories": 85,
"description": "A handful of colorful fruit and soda pop flavored vegan gummy candies made from agar. They have kind of a strange texture, but they're still tasty.",
"price": 180,
"price_postapoc": 200,
"material": [ "junk", "veggy" ],
"volume": "90 ml",
"flags": [ "EDIBLE_FROZEN" ],
"charges": 3,
"fun": 4
},
{
"type": "COMESTIBLE",
"id": "candy3gator",
Expand Down Expand Up @@ -1288,5 +1330,152 @@
"flags": [ "EATEN_HOT" ],
"vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ],
"fun": 4
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_powder_base",
"name": "gelatin dessert powder",
"weight": "175 g",
"color": "white",
"spoils_in": "1461 days",
"container": "box_small",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -8,
"calories": 20,
"description": "A small box of gelatin dessert powder. Just add water and set. Comes in a variety of flavors.",
"price": 5,
"price_postapoc": 10,
"material": [ "flesh", "junk" ],
"volume": "250ml",
"flags": [ "EATEN_COLD" ],
"fun": -2
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_powder_cherry",
"name": "cherry gelatin dessert powder",
"color": "red",
"description": "A small box of cherry gelatin dessert powder. Just add water and set.",
"copy-from": "gelatin_dessert_powder_base"
},
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the other flavors should be compressed into snippets for a single gelatin dessert powder

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be happy to change that. I'm not entirely sure how snippets work though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does snippets work with recipes?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For a reference, check out cooked mutant meat. Basically you have a generic decription in the item and an added "snippet_category" field, and you define a set of snippets with an id separately. A random snippet will be shown after the generic description and if you set the id up right it will persist between viewing.

Copy link
Contributor

@Qrox Qrox Jan 28, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

data/json/items/comestibles/carnivore.json has some examples of comestibles with snippets. For example, "mutant_meat" has snippet category "mutant_meat_desc". But I don't think that will add the correct snippet based on components used in crafting. It also does not change the item's name.

Conditional names can be used to change the item's name based on its components, but that currently does not change the description. And I don't think you can spawn items with specified components at the moment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. I'll have a look through those sections and see what I can do to clean up and compress the different flavours after work today.

{
"type": "COMESTIBLE",
"id": "gelatin_dessert_powder_lime",
"name": "lime gelatin dessert powder",
"color": "light_green",
"description": "A small box of lime gelatin dessert powder. Just add water and set.",
"copy-from": "gelatin_dessert_powder_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_powder_grape",
"name": "grape gelatin dessert powder",
"color": "magenta",
"description": "A small box of grape gelatin dessert powder. Just add water and set.",
"copy-from": "gelatin_dessert_powder_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_powder_raspberry",
"name": "blue raspberry gelatin dessert powder",
"color": "cyan",
"description": "A small box of blue raspberry gelatin dessert powder. Just add water and set.",
"copy-from": "gelatin_dessert_powder_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_base",
"name": "unflavored gelatin dessert",
"weight": "232 g",
"color": "white",
"spoils_in": "7 days 12 hours",
"container": "cup_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"calories": 100,
"description": "An unflavored jiggly, sugary treat made from gelatin and sugar. This would taste better with some flavor.",
"price": 210,
"price_postapoc": 250,
"material": [ "flesh", "junk" ],
"volume": "250 ml",
"phase": "solid",
"fun": 5
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_cherry",
"name": "cherry gelatin dessert",
"color": "red",
"description": "A cherry flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.",
"fun": 20,
"copy-from": "gelatin_dessert_base"
},
Copy link

@ghost ghost Jan 28, 2021 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the other flavored gelatins compressed into snippets for one flavored version in addition to an unflavored, as well.

{
"type": "COMESTIBLE",
"id": "gelatin_dessert_lime",
"name": "lime gelatin dessert",
"color": "light_green",
"description": "A lime flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.",
"fun": 20,
"copy-from": "gelatin_dessert_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_grape",
"name": "grape gelatin dessert",
"color": "magenta",
"description": "A grape flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.",
"fun": 20,
"copy-from": "gelatin_dessert_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_raspberry",
"name": "blue raspberry gelatin dessert",
"color": "cyan",
"description": "A blue raspberry flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.",
"fun": 20,
"copy-from": "gelatin_dessert_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_homemade",
"name": "homemade gelatin dessert",
"color": "light_red",
"description": "A homemade jiggly, sugary treat made from gelatin and sugar flavored with fruit juice. A kid favorite pre-Cataclysm.",
"fun": 25,
"copy-from": "gelatin_dessert_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_fruit",
"name": "fruit filled gelatin dessert",
"color": "light_red",
"description": "A jiggly, sugary treat made from gelatin and sugar flavored with fruit juice and set with fruit. A kid favorite pre-Cataclysm and a healthy treat",
"fun": 20,
"healthy": 1,
"copy-from": "gelatin_dessert_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_vegan",
"name": "vegan gelatin dessert",
"color": "light_green",
"description": "A vegan friendly homemade jiggly, sugary treat made from agar and sugar flavored with fruit juice. A kid favorite pre-Cataclysm. They'll never know the difference.",
"fun": 20,
"material": [ "veggy", "junk" ],
"copy-from": "gelatin_dessert_base"
},
{
"type": "COMESTIBLE",
"id": "gelatin_dessert_vegan_fruit",
"name": "fruit filled vegan gelatin dessert",
"color": "light_green",
"description": "A vegan friendly jiggly, sugary treat made from agar and sugar flavored with fruit juice and set with fruit. A kid favorite pre-Cataclysm and a healthy treat",
"fun": 15,
"material": [ "veggy", "junk" ],
"healthy": 1,
"copy-from": "gelatin_dessert_base"
}
]
83 changes: 83 additions & 0 deletions data/json/items/comestibles/other.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,50 @@
"charges": 4,
"fun": -10
},
{
"type": "COMESTIBLE",
"id": "gelatin_powder",
"name": { "str": "powdered gelatin", "str_pl": "powdered gelatin" },
"weight": "11 g",
"color": "yellow",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -1,
"calories": 6,
"description": "Dried and powdered gelatin, used as a gelling agent when mixed with water.",
"price": 150,
"price_postapoc": 50,
"material": "powder",
"volume": "250 ml",
"flags": [ "EDIBLE_FROZEN" ],
"charges": 25,
"fun": -10
},
{
"type": "COMESTIBLE",
"id": "gelatin_fresh",
"name": { "str": "fresh gelatin" },
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "abomination %s" } },
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "amoral %s" } },
{ "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "Orwell's %s" } }
],
"weight": "25 g",
"color": "yellow",
"spoils_in": "7 days",
"comestible_type": "FOOD",
"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 ",
"price": 150,
"price_postapoc": 50,
"material": [ "flesh" ],
"volume": "250 ml",
"vitamins": [ [ "vitA", 10 ], [ "vitC", 15 ], [ "calcium", 2 ], [ "iron", 8 ] ],
"flags": [ "EATEN_COLD", "FREEZERBURN" ]
},
{
"type": "COMESTIBLE",
"id": "meal_bone_tainted",
Expand Down Expand Up @@ -866,5 +910,44 @@
"price_postapoc": 200,
"freezing_point": -459,
"description": "A small packet of commercial instant coffee powder. No creamer or sweetener added."
},
{
"type": "COMESTIBLE",
"id": "acid_soaked_hide",
"name": "acid soaked hide",
"description": "Raw hide soaking in a dilute acid solution to extract collagen. After 24 hours the solution can be strained to extract fresh gelatin.",
"weight": "500 g",
"color": "yellow",
"sealed": false,
"symbol": "~",
"calories": 9,
"quench": 6,
"fun": -10,
"price": 0,
"volume": "10L",
"price_postapoc": 10,
"phase": "liquid",
"comestible_type": "DRINK",
"flags": [ "NUTRIENT_OVERRIDE" ],
"brewable": { "time": "24 hours", "results": [ "gelatin_extracted" ] }
},
{
"type": "COMESTIBLE",
"id": "gelatin_extracted",
"name": "extracted gelatin",
"description": "Freshly extracted gelatin in a dilute acid solution. It needs to be strained to separate the gelatin from the acid.",
"weight": "500 g",
"color": "yellow",
"sealed": false,
"symbol": "~",
"calories": 9,
"quench": 6,
"fun": -10,
"price": 0,
"volume": "10L",
"price_postapoc": 10,
"phase": "liquid",
"comestible_type": "DRINK",
"flags": [ "NUTRIENT_OVERRIDE" ]
}
]
Loading