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

fix: use copy-from for large yeast jars, general fixes to yeast cultures #4352

Merged
merged 2 commits into from
Mar 15, 2024
Merged

fix: use copy-from for large yeast jars, general fixes to yeast cultures #4352

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e687462
fix: use `copy-from` for large yeast jars, general fixes to yeast cul…
chaosvolt Mar 14, 2024
8f2888b
comment fix
chaosvolt Mar 14, 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
64 changes: 30 additions & 34 deletions data/json/items/tool/cooking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
"id": "flask_yeast",
"type": "GENERIC",
"category": "food",
"name": { "str_sp": "sealed yeast culture" },
"name": { "str_sp": "small sealed yeast culture" },
"description": "A sealed flask holding sanitized yeast wort. You may harvest the yeast inside when it's done culturing.",
"weight": "250 g",
"volume": "250 ml",
Expand Down Expand Up @@ -352,23 +352,48 @@
"name": { "str_sp": "sealed yeast culture" },
"description": "A sealed jar holding sanitized yeast wort. You may harvest the yeast inside when it's done culturing.",
"copy-from": "flask_yeast",
"looks_like": "jar_glass_sealed",
"weight": "500 g",
"volume": "500 ml",
"use_action": {
"target": "yeast",
"msg": "You open the jar and harvest the culture.",
"container": "jar_glass",
"target_charges": 10,
"moves": 50,
"type": "delayed_transform",
"transform_age": 43200,
"not_ready_msg": "The yeast isn't done culturing yet."
"transform_age": 86400,
"not_ready_msg": "The yeast isn't done culturing yet.",
"//": "24 hours"
}
},
{
"id": "jar_3l_glass_yeast",
"type": "GENERIC",
"name": { "str_sp": "large sealed yeast culture" },
"description": "A sealed 3L glass jar holding sanitized yeast wort. You may harvest the yeast inside when it's done culturing.",
"copy-from": "jar_yeast",
"looks_like": "jar_3l_glass_sealed",
"weight": "3 kg",
"volume": "3 L",
"use_action": {
"target": "yeast",
"msg": "You open the jar and harvest the culture.",
"container": "jar_3l_glass",
"target_charges": 60,
"moves": 50,
"type": "delayed_transform",
"transform_age": 259200,
"not_ready_msg": "The yeast isn't done culturing yet.",
"//": "3 days"
}
},
{
"id": "wild_yeast",
"type": "GENERIC",
"name": { "str_sp": "sealed wild yeast culture" },
"description": "Mixture of water, sugar and fruits with some naturally occuring yeast, that will eventually produce a more sizeable yeast culture.",
"copy-from": "flask_yeast",
"description": "Mixture of water, sugar and fruits with some naturally occurring yeast, that will eventually produce a more sizable yeast culture.",
"copy-from": "jar_yeast",
"use_action": {
"target": "yeast",
"msg": "You open the jar and harvest the culture.",
Expand Down Expand Up @@ -967,34 +992,5 @@
]
],
"magazine_well": "250 ml"
},
{
"id": "jar_3l_glass_yeast",
"type": "GENERIC",
"category": "food",
"name": { "str_sp": "sealed yeast culture" },
"description": "A sealed 3L glass jar holding sanitized yeast wort. You may harvest the yeast inside when it's done culturing.",
"weight": "365 g",
"volume": "3 L",
"price": "0 cent",
"price_postapoc": "10 cent",
"to_hit": -1,
"bashing": 5,
"material": [ "glass", "powder" ],
"symbol": ")",
"looks_like": "jar_3l_glass_sealed",
"color": "light_cyan",
"use_action": {
"target": "yeast",
"msg": "You open the jar and harvest the culture.",
"container": "jar_3l_glass",
"target_charges": 60,
"moves": 50,
"type": "delayed_transform",
"transform_age": 43200,
"not_ready_msg": "The yeast isn't done culturing yet.",
"//": "12 hours"
},
"flags": [ "TRADER_AVOID" ]
}
]
Loading