-
Notifications
You must be signed in to change notification settings - Fork 290
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
Conversation
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. |
So, 41? |
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. |
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.
Cataclysm-BN/data/json/items/comestibles/other.json
Lines 533 to 554 in c8fe194
{ | |
"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,
Cataclysm-BN/data/json/recipes/food/veggi.json
Lines 1886 to 1903 in 5774f16
{ | |
"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.
this caused 2 * 4 = 8 charges of canned tomatoes to be made.
reducing it to 2 made the tests pass.
* Update other.json * Update food.json * Update other.json * fix: jarred recipe generating (8/4) canned tomatoes --------- Co-authored-by: scarf <greenscarf005@gmail.com>
@scarf005 thanks |
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:
After:
