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

Make most of the weaker alcohols mixable. #54799

Merged
merged 1 commit into from
Jan 31, 2022
Merged

Make most of the weaker alcohols mixable. #54799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
"volume": "250 ml",
"phase": "liquid",
"charges": 7,
"flags": [ "EATEN_COLD" ],
"flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE" ],
"freezing_point": -30,
"fun": 5
},
Expand Down
10 changes: 1 addition & 9 deletions data/json/recipes/chem/fuel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,7 @@
"book_learn": [ [ "textbook_chemistry" ], [ "distilling_cookbook", 4 ] ],
"qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ],
"tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "thermometer", -1 ] ] ],
"components": [
[
[ "hard_liquor", 14, "LIST" ],
[ "weak_liquor", 10, "LIST" ],
[ "wash_liquor", 42, "LIST" ],
[ "cheap_wine", 56, "LIST" ],
[ "worthy_wine", 40, "LIST" ]
]
]
"components": [ [ [ "mixed_alcohol_strong", 14 ], [ "mixed_alcohol_weak", 10 ], [ "wash_liquor", 42, "LIST" ] ] ]
},
{
"result": "methed_alcohol",
Expand Down
26 changes: 7 additions & 19 deletions data/json/recipes/recipe_food.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5086,17 +5086,19 @@
"flags": [ "BLIND_EASY" ],
"components": [
[
[ "hard_liquor_unmixed", 1, "LIST" ],
[ "brandy", 1 ],
[ "canadian_whiskey", 1 ],
[ "cheap_whiskey", 1 ],
[ "gin", 1 ],
[ "moonshine", 1 ],
[ "rum", 1 ],
[ "single_malt_whiskey", 1 ],
[ "cheap_whiskey", 1 ],
[ "canadian_whiskey", 1 ],
[ "single_pot_whiskey", 1 ],
[ "tequila", 1 ],
[ "triple_sec", 1 ],
[ "vodka", 1 ],
[ "whiskey", 1 ],
[ "brandy", 1 ]
[ "whiskey", 1 ]
]
]
},
Expand All @@ -5111,21 +5113,7 @@
"charges": 1,
"autolearn": true,
"flags": [ "BLIND_EASY" ],
"components": [
[
[ "beer", 1 ],
[ "belgian_ale", 1 ],
[ "drink_beeknees", 1 ],
[ "drink_hard_seltzer", 1 ],
[ "european_pilsner", 1 ],
[ "hb_beer", 1 ],
[ "hb_seltzer", 1 ],
[ "india_pale_ale", 1 ],
[ "wine_barley", 1 ],
[ "pale_ale", 1 ],
[ "stout", 1 ]
]
]
"components": [ [ [ "weak_liquor_unmixed", 1, "LIST" ] ] ]
},
{
"type": "recipe",
Expand Down
66 changes: 39 additions & 27 deletions data/json/requirements/cooking_components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,38 +170,43 @@
]
},
{
"id": "hard_liquor",
"id": "hard_liquor_unmixed",
"type": "requirement",
"//": "Hard liquor - necessarily comestible and high proof, not necessarily high quality.",
"//": "Technical artifact to support mixed alcohol recipe. See comment on `hard_liquor` below for semantics.",
"components": [
[
[ "brandy", 1 ],
[ "canadian_whiskey", 1 ],
[ "cheap_whiskey", 1 ],
[ "gin", 1 ],
[ "moonshine", 1 ],
[ "vodka", 1 ],
[ "whiskey", 1 ],
[ "rum", 1 ],
[ "single_malt_whiskey", 1 ],
[ "cheap_whiskey", 1 ],
[ "canadian_whiskey", 1 ],
[ "single_pot_whiskey", 1 ],
[ "brandy", 1 ],
[ "rum", 1 ],
[ "gin", 1 ],
[ "tequila", 1 ],
[ "mixed_alcohol_strong", 1 ]
[ "vodka", 1 ],
[ "whiskey", 1 ]
]
]
},
{
"id": "hard_liquor",
"type": "requirement",
"//": "Hard liquor - necessarily comestible and high proof, not necessarily high quality. 7 portions per 250ml",
"components": [ [ [ "hard_liquor_unmixed", 1, "LIST" ], [ "mixed_alcohol_strong", 1 ] ] ]
},
{
"id": "cheap_wine",
"type": "requirement",
"//": "Cheap and improvised wines.",
"components": [
[
[ "fruit_wine", 1 ],
[ "bum_wine", 1 ],
[ "dandelion_wine", 1 ],
[ "burdock_wine", 1 ],
[ "dandelion_wine", 1 ],
[ "fruit_wine", 1 ],
[ "pine_wine", 1 ],
[ "bum_wine", 1 ]
[ "wine_barley", 1 ]
]
]
},
Expand All @@ -211,15 +216,15 @@
"//": "More expensive wines.",
"components": [
[
[ "wine_riesling", 1 ],
[ "wine_chardonnay", 1 ],
[ "bristol_sherry", 1 ],
[ "madeira", 1 ],
[ "sherry", 1 ],
[ "wine_cabernet", 1 ],
[ "wine_noir", 1 ],
[ "wine_vermouth", 1 ],
[ "wine_chardonnay", 1 ],
[ "wine_marsala", 1 ],
[ "sherry", 1 ],
[ "bristol_sherry", 1 ],
[ "madeira", 1 ]
[ "wine_noir", 1 ],
[ "wine_riesling", 1 ],
[ "wine_vermouth", 1 ]
]
]
},
Expand Down Expand Up @@ -959,27 +964,34 @@
"components": [ [ [ "wash_vodka", 1 ], [ "wash_whiskey", 1 ], [ "wash_rum", 1 ], [ "wash_moonshine", 1 ] ] ]
},
{
"id": "weak_liquor",
"id": "weak_liquor_unmixed",
"type": "requirement",
"//": "Weak liquor - necessarily comestible and low proof, not necessarily high quality",
"//": "Technical artifact to support mixed alcohol recipe. See `weak_liquor` comment below for semantics.",
"components": [
[
[ "cheap_wine", 5, "LIST" ],
[ "worthy_wine", 5, "LIST" ],
[ "beer", 1 ],
[ "belgian_ale", 1 ],
[ "drink_beeknees", 1 ],
[ "bristol_sherry", 1 ],
[ "drink_hard_seltzer", 1 ],
[ "european_pilsner", 1 ],
[ "hb_beer", 1 ],
[ "hb_seltzer", 1 ],
[ "imperial_stout", 1 ],
[ "india_pale_ale", 1 ],
[ "wine_barley", 1 ],
[ "mead", 1 ],
[ "pale_ale", 1 ],
[ "stout", 1 ],
[ "imperial_stout", 1 ],
[ "mixed_alcohol_weak", 1 ]
[ "stout", 1 ]
]
]
},
{
"id": "weak_liquor",
"type": "requirement",
"//": "Weak liquor - necessarily comestible and low proof, not necessarily high quality. 250ml",
"components": [ [ [ "weak_liquor_unmixed", 1, "LIST" ], [ "mixed_alcohol_weak", 1 ] ] ]
},
{
"id": "soda_pop",
"type": "requirement",
Expand Down