Fix food auditor for new food system #10059
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.
Changes proposed in this pull request:
maxlevel
changed in the food update. It now uses a common implementation.tier
column which contains the MineColonies food tier level (or empty for non-mcol food).actual0
-actual5
columns which contain the actual food value a colonist with the given residence level will gain. (This does not include the research bonus.)Known or suspected (pre-existing) issues not fixed in this pull request:
rawNutrition >= (restaurantLevel - 1)
, which is very unrelated to actual food value.canEat(restaurantLevel)
, which notably is arawNutrition >= (restaurantLevel + 1)
check.canEat
allowing any food for level 1-2 while theFood
request does not.(Some of these things might be fixed by #10054)
[x] Yes I tested this before submitting it.
[ ] I also did a multiplayer test.
Review please