Make most of the weaker alcohols mixable. #54799
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Content "Make most of the weaker alcohols mixable"
Purpose of change
Fixes #54788
Describe the solution
Add
cheap_wine
andworthy_wine
lists to theweak_liquor
requirement;make weak mixed alcohol depend on said requirements instead of duplicating all the alcohols again;
do a little dance to prevent self-referrential recipe;
do the same sort of thing for strong mixed alcohol as well.
Also add a NUTRITION_OVERRIDE to strong mixed alcohol so that it forgets what it's made out of and can actually be mixed. (The existence of this bug makes me think nobody's been using this recipe all this time, but oh well).
While at it, i went ahead and made the ethanol require explicitly mixed alcohols instead of listing the individual options. I claim this makes the recipe easier to read in-game, and the hurdle of performing the mix is pretty much absent.
Describe alternatives you've considered
N/A
Testing
spawned a bottle of chardonay, bottle of riesling, two cans of beer and two cans of Indi pale ale; mixed them all onto a gallon jug, got 2.5L of weak mixed alcohol; made ethanol got 250ml out;
spawned a bottle of whiskey, a bottle of brandy and a bottle of vodka; mixed them all into a gallon jug, got 2.25L of strong mixed alcohol; made ethanol out of that, got 1L out.
Additional context
I didn't make any cocktails mixable, so as to prevent abuse where you could potentially convert weak mixed alcohol + something into a cocktail, which then itself is convertible into weak mixed alcohol, resulting in extra alchohol for free.