-
Notifications
You must be signed in to change notification settings - Fork 256
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
feat(balance): Fix deluxe oatmeal possibly having too few calories #4991
Conversation
Now for the recipe balance
Realism
Uses 5 oatmeals each
Figures deluxe oatmeal would mess up in one of the tests Though at the same time... that average looks suspiciously high |
In game it claims the max calories for the deluxe oatmeal is 372 a portion, which would be 744 combined at most (still more than the range max, yes, but not as high as the 900 figure it's claiming for the average in the test) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
D:\a\Cataclysm-BN\Cataclysm-BN\tests\comestible_test.cpp(173): FAILED:
CHECK( mystats.calories.avg() <= upper_bound )
with expansion:
949.1666666667 <= 383.6412f
with message:
recipe id: oatmeal_deluxe
used:
[oatmeal (5)]
[sugar (4), maple syrup (1), sugar beet syrup (1), molasses (1), coffee
syrup (1), condensed milk (1), honey comb (1), forest honey (1), candied
honey (2), jam (1), irradiated strawberry (1), strawberries (1), irradiated
blueberry (1), blueberries (1), irradiated cherry (1), cherries (1),
irradiated plum (1), plum (1), irradiated grape (1), grapes (1), irradiated
cranberry (1), cranberries (1), irradiated raspberry (1), raspberries (1),
irradiated blackberry (1), blackberries (1), irradiated pomegranate (1),
pomegranate (1), dehydrated fruit (1), or juice pulp (2)]
[water (1) or clean water (1)]
result: oatmeal_deluxe
calorie test seems to fail.
I hope this makes the tests a bit less angry at me
Yeah, already took note. Let's see if I at all understand how that test works, haha |
I swear, this is ridiculous. This is now OUTSIDE OF WHAT THE CRAFTING MENU CLAIMS IS POSSIBLE
I've officially increased the natural calories of the deluxe oatmeal BEYOND WHAT THE CRAFTING MENU SAYS IS POSSIBLE. I swear, that average must be fucking up somewhere given the "average" is higher than the game claims is the maximum for crafted variants |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
excessive calories goes brrrrrr
Given that this has resulted in giving the oatmeal natural calories above what the crafting menu claims is possible, I'm just a touch uncertain about the idea of merging this. But oh well, figuring out wtf is wrong with the comestibles test is outside of this PR's scope anyway. |
Anyway, mergers may merge at their own discretion |
Hmm, very weird. |
Checklist
Required
main
so it won't cause conflict when updatingmain
branch later.Purpose of change
As pointed out by ArkantosAoM on Reddit, deluxe oatmeal had the potential to, when crafted, end up with less calories than the cooked oatmeal. This, inherently, makes no sense whatsoever. As such, this PR fixes it so that the deluxe oatmeal properly has the calories it ought to. In the process, it also slightly adjusts the values of oatmeal (going from 25 grams per charge to 50, and going from 16 charges to 10) and makes the recipes reflect the amount of oatmeal they'd actually take.
Describe the solution
Describe alternatives you've considered
I just feel like 16 charges is a bit of an arbitrary number, and 50g with 10 charges is much nicer and rounder.
Testing
Loaded into game, can confirm that deluxe oatmeal has a total calories over its two portions of higher than cooked oatmeal no matter what now.
![image](https://private-user-images.githubusercontent.com/30732426/348586355-517f0f72-61e2-4ad4-99a8-03ff5261cf3b.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjEyNDg1MDgsIm5iZiI6MTcyMTI0ODIwOCwicGF0aCI6Ii8zMDczMjQyNi8zNDg1ODYzNTUtNTE3ZjBmNzItNjFlMi00YWQ0LTk5YTgtMDNmZjUyNjFjZjNiLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA3MTclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNzE3VDIwMzAwOFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTJhZDJhZmVmZmI4NTI2NmUxZWU3NmE2YTNiNTU2ZDg1NTUzNWNlZTcwMGNiZWU2YWQzNjBkYjJlNjQ2ZTY5NmMmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.UVG1RRLrmXEUDDqe1GAG7LTaG5ULJTT7FKz4j8q872I)
![image](https://private-user-images.githubusercontent.com/30732426/348586377-da3826de-9acd-42f1-8569-1c8107575403.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjEyNDg1MDgsIm5iZiI6MTcyMTI0ODIwOCwicGF0aCI6Ii8zMDczMjQyNi8zNDg1ODYzNzctZGEzODI2ZGUtOWFjZC00MmYxLTg1NjktMWM4MTA3NTc1NDAzLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA3MTclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNzE3VDIwMzAwOFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTIyOTc0ODg3ZTY0MmIyMWFkMzNlZThmM2FlZTk2OGM0MTdkMGJiMzliZmY4NThlNzY2OGRjNjBkZGI0ZmM5MzEmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.RzR9ekDTyVO9I6J5wB0HAufHjEpSuncZFpQnkUvQU30)
Additional context
Making oats into oatmeal is currently performing some sort of arcane alchemy to create more matter than is put in (including before my change to oatmeal's mass), but I'm unsure the best route to take with making that sensible and feel it'd be better as another PR.