More complex satiety calculations (#40402)

CleverRaven · May 11, 2020 · ffc02de · ffc02de
1 parent a0cc190
commit ffc02de
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/consumption.cpp b/src/consumption.cpp
@@ -1315,12 +1315,19 @@ bool Character::consume_effects( item &food )
         set_hunger( capacity );
     }
 
+    nutrients food_nutrients = compute_effective_nutrients( food );
     // TODO: Move quench values to mL and remove the magic number here
-    units::volume water = food.type->comestible->quench * 5_ml;
+    units::volume water_vol = food.type->comestible->quench * 5_ml;
+    units::volume food_vol = food.base_volume() - std::max( water_vol, 0_ml );
+    units::mass food_weight = ( food.weight() / food.count() ) - units::from_gram( units::to_milliliter(
+                                  water_vol ) ); //water is 1 gram per milliliter
+    double ratio = std::max( static_cast<double>( food_nutrients.kcal ) / units::to_gram( food_weight ),
+                             1.0 );
+
     food_summary ingested{
-        water,
-        food.base_volume() - std::max( water, 0_ml ),
-        compute_effective_nutrients( food )
+        water_vol,
+        food_vol * ratio,
+        food_nutrients
     };
     // Maybe move tapeworm to digestion
     if( has_effect( effect_tapeworm ) ) {

diff --git a/tests/stomach_contents_test.cpp b/tests/stomach_contents_test.cpp
@@ -268,8 +268,8 @@ TEST_CASE( "hunger" )
     if( print_tests ) {
         printf( "%d minutes til hunger sets in\n", hunger_time );
     }
-    CHECK( hunger_time <= 240 );
-    CHECK( hunger_time >= 210 );
+    CHECK( hunger_time <= 435 );
+    CHECK( hunger_time >= 405 );
     if( print_tests ) {
         print_stomach_contents( dummy, print_tests );
         printf( "eat 16 veggy\n" );