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.

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 curry/chili powder substitutions #34540

Merged
merged 3 commits into from
Dec 25, 2019

Conversation

lazho
Copy link
Contributor

@lazho lazho commented Oct 7, 2019

Summary

SUMMARY: Content "Fix recipe substitutions for chili and curry powder"

Purpose of change

Related to #34068, mentioned in point 2 and 3 of proposed solution.

Describe the solution

Removed instances in food recipes where red sauce appears next to curry/chili powder and chili pepper.

Added chili powder as substitute for curry powder in every recipe curry powder is used.

Describe alternatives you've considered

N/A?

Additional context

Before (recipe is curry with meat)
beforecurry
After
curryafter

@lazho lazho changed the title remove red sauce as substitute for chilly p and curry powder fix curry/chili powder subtitutions Oct 7, 2019
@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Food / Vitamins Comestibles and drinks labels Oct 7, 2019
@lazho
Copy link
Contributor Author

lazho commented Oct 7, 2019

btw this PR is JSON only... currently tagged as C++

@lazho lazho force-pushed the 34068-red-sauce-substitutions branch from 412e7d0 to b037bed Compare October 8, 2019 04:26
@KorGgenT KorGgenT added [JSON] Changes (can be) made in JSON and removed [C++] Changes (can be) made in C++. Previously named `Code` labels Oct 9, 2019
@KorGgenT
Copy link
Member

KorGgenT commented Oct 9, 2019

The food tests are failing. Here are the outputs:
image
image
image

@lazho
Copy link
Contributor Author

lazho commented Oct 9, 2019

That's strange. For this recipe, the only change was adding 20 chili powder as alternative to 20 curry powder. Neither should have any caloric content.

In this test, does the calorie counting recurse into the components of the components? Because that may be why this is happening.

@ZhilkinSerg ZhilkinSerg changed the title fix curry/chili powder subtitutions Fix curry/chili powder substitutions Oct 30, 2019
@ZhilkinSerg
Copy link
Contributor

I am not 100% sure, but I think you need to use NUTRIENT_OVERRIDE item flag here.

@kevingranade
Copy link
Member

That's a very odd outcome, I agree this should not have done anything to the nutrition test.
I can only guess that the change is that before it was three different recipe variants and after it's six recipe variants, and this shrunk the confidence interval for the test, causing it to fail.

@kevingranade
Copy link
Member

I notice sausage and bratwurst have pretty different calories, 474 vs 297. This was probably right on the border of failing previously. The smallest change likely to make the test happy is to bump the bratwurst requirement to three portions.

@kevingranade
Copy link
Member

kevingranade commented Dec 17, 2019

Ok I checked and that didn't do it, but i works if you cut all the quantities of the currywurst recipe in half.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants