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

MozzarellaCheese #64418

Merged
merged 15 commits into from
Mar 22, 2023
Merged

MozzarellaCheese #64418

merged 15 commits into from
Mar 22, 2023

Conversation

LordBarkBread
Copy link
Contributor

Summary

Content "adds a new type of cheese, mozzarella cheese, into the game."

Purpose of change

More cheese recipes and alternatives should be made into cataclysm.

Describe the solution

Added in a new cheese type along with recipes for it's use.

Describe alternatives you've considered

No Mozzarella to be had.

Testing

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Food / Vitamins Comestibles and drinks Spawn Creatures, items, vehicles, locations appearing on map labels Mar 20, 2023
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/requirements/cooking_components.json Outdated Show resolved Hide resolved
LordBarkBread and others added 5 commits March 20, 2023 15:20
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/requirements/cooking_components.json Outdated Show resolved Hide resolved
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/recipes/food/dairy_products.json Outdated Show resolved Hide resolved
data/json/requirements/cooking_components.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Mar 20, 2023
@Maleclypse
Copy link
Member

Maleclypse commented Mar 21, 2023

(~[slow] ~[.],starting_items)=> Current recipe range: 1320-1320, Average 1320.0, Stddev 0.0
(~[slow] ~[.],starting_items)=> Average recipe Calories must fall within this range, derived from default Calories: 188-312
(~[slow] ~[.],starting_items)=>

OK so right now one thing of mozzarella is a boatload of calories because it has only a single charge, and uses 10 milk. And that's throwing off your recipe I think. Also 450 calories should be the number of calories in multiple mozz sticks probably because when I googled them, the google says it's 85 calories each.

@LordBarkBread
Copy link
Contributor Author

(~[slow] ~[.],starting_items)=> Current recipe range: 1320-1320, Average 1320.0, Stddev 0.0
(~[slow] ~[.],starting_items)=> Average recipe Calories must fall within this range, derived from default Calories: 188-312
(~[slow] ~[.],starting_items)=>

OK so right now one thing of mozzarella is a boatload of calories because it has only a single charge, and uses 10 milk. And that's throwing off your recipe I think. Also 450 calories should be the number of calories in multiple mozz sticks probably because when I googled them, the google says it's 85 calories each.

I knew the calories looked off to me in game when I was testing but I wasn't fully-for-sure since I still don't fully grasp the cooking recipe system in the game. I just updated it though so maybe that'll fix it? Thank you by the way.

@Maleclypse
Copy link
Member

Maleclypse commented Mar 21, 2023

./tests/comestible_test.cpp:231: FAILED:
(~[slow] ~[.],starting_items)=>   CHECK( mystats.calories.avg() <= upper_bound )
(~[slow] ~[.],starting_items)=> with expansion:
Error: (~[slow] ~[.],starting_items)=>   1253.7692307692 <= 1045.614[87](https://github.com/CleverRaven/Cataclysm-DDA/actions/runs/4480471024/jobs/7875841209?pr=64418#step:15:88)f
(~[slow] ~[.],starting_items)=> 
(~[slow] ~[.],starting_items)=> 
(~[slow] ~[.],starting_items)=> 
(~[slow] ~[.],starting_items)=> RecipeID: fried_mozzarella_sticks, default is 800 Calories,
(~[slow] ~[.],starting_items)=> Current recipe range: 1179-1651, Average 1253.8, Stddev 122.8
(~[slow] ~[.],starting_items)=> Average recipe Calories must fall within this range, derived from default Calories: 554-1046
(~[slow] ~[.],starting_items)=>

Getting closer. Let me know if you get frustrated with it and I'll figure out some combination of changes that makes it make sense and pass the test. I don't know why but once I really learned this test, it's kind of fun to make it work but before that it was incredibly frustrating to me.

edit: if you decide you want me to figure it out, ping me on discord please.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 22, 2023
@dseguin dseguin merged commit bfffbf2 into CleverRaven:master Mar 22, 2023
sparr pushed a commit to sparr/Cataclysm-DDA that referenced this pull request Mar 23, 2023
* MozzarellaCheese

* Update data/json/recipes/food/dairy_products.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/recipes/food/dairy_products.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/recipes/food/dairy_products.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/recipes/food/dairy_products.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/requirements/cooking_components.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update dairy.json

* Update dairy.json

* Update dairy.json

* Update dairy_products.json

* Update dairy_products.json

* Update data/json/items/comestibles/dairy.json

Co-authored-by: Anton Burmistrov <[email protected]>

* Update dairy_products.json

* Apply suggestions from code review

* Update data/json/recipes/food/dairy_products.json

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Anton Burmistrov <[email protected]>
Co-authored-by: Maleclypse <[email protected]>
@LordBarkBread LordBarkBread deleted the somethingbark branch March 26, 2023 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants