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

Canned tomatoes should no longer appear half-full #3291

Merged
merged 4 commits into from
Sep 28, 2023
Merged

Canned tomatoes should no longer appear half-full #3291

merged 4 commits into from
Sep 28, 2023

Conversation

0Monet
Copy link
Contributor

@0Monet 0Monet commented Sep 27, 2023

Summary

SUMMARY: "Canned tomatoes should no longer appear half-full in their sealed containers and with the wrong amount of calories"

Purpose of change

Canned tomatoes appear 1/2 in 250 ml cans and 12/24 in 3L glass jars.
They also have 30 caloris in game, while in the other.json, 41 caloris are marked.

Describe the solution

Remove "stack_size": 2, replace it with "charges": 2,
Changing caloris from 41 to 55 to get 41 in the game seems to work.

Describe alternatives you've considered

Do nothing.

Testing

Test on my game and nothing special happens.

Additional context

In my game (cbn-windows-tiles-x64-2023-09-27-0719):
Before:
Capture d’écran 2023-09-27 145152

After:
Capture d’écran 2023-09-27 142941

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Sep 27, 2023
@scarf005 scarf005 requested a review from chaosvolt September 27, 2023 14:52
@chaosvolt
Copy link
Member

Uuuugh I hate the comestible tests, those are failing due to this. They probably should be set to 30 instead if that's what they have when made in-game, or left at 41 if that was keeping it from borking previously.

@0Monet
Copy link
Contributor Author

0Monet commented Sep 27, 2023

So, 41?

@chaosvolt
Copy link
Member

Hmm, test is still failing. Maybe try 30, or maybe buffing raw tomatoes so that crafted canned tomatoes will correctly match their base value would be better, not sure. For all I know that might break some other obscure comestible that uses tomatoes, bleh.

Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{
"type": "COMESTIBLE",
"id": "can_tomato",
"name": { "str": "canned tomato", "str_pl": "canned tomatoes" },
"weight": "128 g",
"color": "red",
"spoils_in": "3 days 18 hours",
"container": "can_food",
"comestible_type": "FOOD",
"symbol": "%",
"quench": 3,
"healthy": 1,
"calories": 41,
"description": "Canned tomato. A staple in many pantries, and useful for many recipes.",
"price": 350,
"price_postapoc": 100,
"material": "tomato",
"volume": "250 ml",
"charges": 2,
"vitamins": [ [ "vitA", 3 ], [ "vitC", 26 ], [ "calcium", 9 ], [ "iron", 18 ] ],
"flags": [ "RAW" ]
},

Canned Tomatoes now have 2 charges,

{
"type": "recipe",
"result": "can_tomato",
"id_suffix": "jarred",
"byproducts": [ [ "water", 10 ] ],
"container": "jar_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"difficulty": 4,
"time": "30 m",
"book_learn": [ [ "cookbook_italian", 4 ], [ "manual_canning", 3 ] ],
"result_mult": 4,
"batch_time_factors": [ 80, 5 ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
"components": [ [ [ "water", 12 ], [ "water_clean", 12 ] ], [ [ "jar_glass", 1 ] ], [ [ "tomato", 4 ], [ "irradiated_tomato", 4 ] ] ]
},

and Sealed Jar Recipe makes 4 units of canned tomatoes.

Cataclysm: Bright Nights - dc43e235355_01

this caused 2 * 4 = 8 charges of canned tomatoes to be made.

Cataclysm : fish_01

reducing it to 2 made the tests pass.

@chaosvolt chaosvolt added this pull request to the merge queue Sep 28, 2023
Merged via the queue into cataclysmbnteam:upload with commit 8e6dd60 Sep 28, 2023
scarf005 added a commit to scarf005/Cataclysm-BN that referenced this pull request Sep 28, 2023
* Update other.json

* Update food.json

* Update other.json

* fix: jarred recipe generating (8/4) canned tomatoes

---------

Co-authored-by: scarf <greenscarf005@gmail.com>
@0Monet
Copy link
Contributor Author

0Monet commented Sep 28, 2023

@scarf005 thanks

@0Monet 0Monet deleted the can_tomato_change branch September 28, 2023 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants