Skip to content

fix meat (caloric) density #81908

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.

Sign up for GitHub

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

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
+6 −13
Open

fix meat (caloric) density #81908

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3d89792
update meat (caloric) density
dynst Jul 19, 2025
5edb74b
bacon_uncut TEST_DATA
dynst Jul 19, 2025
dd601a9
fix densities
dynst Jul 19, 2025
de08e63
cracklins TEST_DATA
dynst Jul 19, 2025
ebeba0c
compromise on calories and weight
dynst Jul 19, 2025
8171734
fix and document caloric density
dynst Jul 19, 2025
69a54cc
use item inheritance for meat_cooked and offal_cooked
dynst Jul 19, 2025
8a6444d
cooking weight reduction all around
dynst Jul 19, 2025
c4cc5c4
use inheritance for peppered meats
dynst Jul 19, 2025
c59f86e
set meat_cooked fun: 0
dynst Jul 19, 2025
00251ff
use inheritance for peppermeat
dynst Jul 19, 2025
78fb6cd
update mutant_human_cooked
dynst Jul 19, 2025
325450d
update temperature test
dynst Jul 19, 2025
3903aff
update stomach hunger test
dynst Jul 19, 2025
fd4f4e8
update temperature test
dynst Jul 19, 2025
d122aa8
undo everything
dynst Jul 20, 2025
fd6fe6e
just fix calories
dynst Jul 20, 2025
271ee99
update hunger test
dynst Jul 20, 2025
8f8d0eb
fix cracklins density
dynst Jul 20, 2025
2095cf6
Update data/json/items/comestibles/carnivore.json
Maleclypse Jul 29, 2025
1c8d7b1
Update data/json/items/comestibles/carnivore.json
Maleclypse Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions data/json/items/comestibles/carnivore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
"price": "5 USD",
"price_postapoc": "50 cent",
"spoils_in": "1 day",
"calories": 402,
"calories": 680,
"fun": -10,
"cooks_like": "meat_cooked",
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "meat_allergen", 1 ] ],
Expand Down Expand Up @@ -519,7 +519,6 @@
{
"id": "mutant_human_cooked",
"copy-from": "mutant_human_flesh",
"calories": 402,
"type": "ITEM",
"subtypes": [ "COMESTIBLE" ],
"name": { "str_sp": "cooked cretin" },
Expand All @@ -532,7 +531,6 @@
{
"id": "peppermutant_human",
"copy-from": "mutant_human_flesh",
"calories": 402,
"type": "ITEM",
"subtypes": [ "COMESTIBLE" ],
"name": { "str_sp": "cooked pepper cretin" },
Expand Down Expand Up @@ -619,7 +617,7 @@
"price": "7 USD 50 cent",
"price_postapoc": "1 USD",
"parasites": 0,
"calories": 402,
"calories": 680,
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "meat_allergen", 1 ] ],
"flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
},
Expand All @@ -637,7 +635,7 @@
"price_postapoc": "1 USD 50 cent",
"fun": 2,
"parasites": 0,
"calories": 402,
"calories": 680,
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "meat_allergen", 1 ] ],
"flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/meat_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@
"id": "cracklins",
"name": { "str_sp": "cracklins" },
"weight": "42 g",
"volume": "100 ml",
"color": "brown",
"spoils_in": "7 days",
"container": "bag_plastic_small",
Expand All @@ -245,7 +246,6 @@
"calories": 270,
"description": "Also known as pork rinds or chicharrones, these are bits of edible fat and skin that have been fried until they are crispy and delicious.",
"price": "42 cent",
"volume": "25 ml",
"price_postapoc": "125 cent",
"material": [ "flesh" ],
"flags": [ "EATEN_HOT" ],
Expand Down
5 changes: 0 additions & 5 deletions data/mods/TEST_DATA/known_bad_density.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"bot_gasbomb_hack",
"tailoring_pattern_set",
"k_gambeson_vest_xs",
"mutant_cracklins",
"venom_wasp",
"cooked_marrow",
"broken_mech_combat",
Expand Down Expand Up @@ -215,7 +214,6 @@
"alien_pod_resin",
"engineering_robotics_kit",
"bot_grenade_hack",
"human_cracklins",
"protein_powder",
"large_stomach_sealed",
"book_nonf_hard_dodge_tlwd",
Expand Down Expand Up @@ -268,7 +266,6 @@
"FlatCoin",
"button_wood",
"plastic_mandible_guard",
"cracklins",
"meat_canned",
"pistachio",
"nachosvc",
Expand Down Expand Up @@ -341,7 +338,6 @@
"corpse_generic_human",
"drivebelt_makeshift",
"loincloth_leather",
"mutant_human_cracklins",
"ammonia_liquid",
"tainted_marrow",
"shed_stick",
Expand Down Expand Up @@ -407,7 +403,6 @@
"base_plastic_silverware",
"mannequin_decoy",
"corpse_generic_female",
"demihuman_cracklins",
"condensor_coil",
"waterskin2",
"disinfectant",
Expand Down
4 changes: 2 additions & 2 deletions tests/stomach_contents_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@ TEST_CASE( "hunger" )
print_stomach_contents( dummy, print_tests );
printf( "eat 2 beansnrice\n" );
}
CHECK( hunger_time <= 240 );
CHECK( hunger_time >= 210 );
CHECK( hunger_time <= 270 );
CHECK( hunger_time >= 240 );
f = item( itype_beansnrice );
dummy.consume( f );
f = item( itype_beansnrice );
Expand Down
Loading