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.

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

Fix character volume calculation #74348

Merged
merged 8 commits into from
Jun 15, 2024
Merged

Fix character volume calculation #74348

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
93a8f76
Provide body volume calculation based on body density
feinorgh Jun 5, 2024
5afd5b5
Simplify calculations
feinorgh Jun 6, 2024
64cf7a6
Adjust test cases to the volume calculation
feinorgh Jun 6, 2024
8850226
Adjust volumes for baseline tests too
feinorgh Jun 6, 2024
e1a257b
Make checks for volume pass within reasaonable ranges
feinorgh Jun 11, 2024
5e8eb72
Make checks for volume less dependent on exact volumes
feinorgh Jun 11, 2024
9fcc074
Make tests exact, set character to exact calorie count
feinorgh Jun 11, 2024
d86a466
Remove unused header units.h
feinorgh Jun 11, 2024
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
13 changes: 9 additions & 4 deletions tests/char_volume_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,23 @@ TEST_CASE( "character_baseline_volumes", "[volume]" )
Character &you = get_player_character();
REQUIRE( you.get_mutations().empty() );
REQUIRE( you.height() == 175 );
CHECK( ( you.get_base_volume() > 55_liter && you.get_base_volume() < 80_liter ) );

REQUIRE( your_height_with_trait( trait_SMALL2 ) == 70 );
CHECK( your_volume_with_trait( trait_SMALL2 ) == 23326_ml );
CHECK( ( your_volume_with_trait( trait_SMALL2 ) > 20_liter &&
your_volume_with_trait( trait_SMALL2 ) < 30_liter ) );
RenechCDDA marked this conversation as resolved.
Show resolved Hide resolved

REQUIRE( your_height_with_trait( trait_SMALL ) == 122 );
CHECK( your_volume_with_trait( trait_SMALL ) == 42476_ml );
CHECK( ( your_volume_with_trait( trait_SMALL ) > 40_liter &&
your_volume_with_trait( trait_SMALL ) < 50_liter ) );

REQUIRE( your_height_with_trait( trait_LARGE ) == 227 );
CHECK( your_volume_with_trait( trait_LARGE ) == 116034_ml );
CHECK( ( your_volume_with_trait( trait_LARGE ) > 100_liter &&
your_volume_with_trait( trait_LARGE ) < 120_liter ) );

REQUIRE( your_height_with_trait( trait_HUGE ) == 280 );
CHECK( your_volume_with_trait( trait_HUGE ) == 156228_ml );
CHECK( ( your_volume_with_trait( trait_HUGE ) > 150_liter &&
your_volume_with_trait( trait_HUGE ) < 200_liter ) );
}

TEST_CASE( "character_at_volume_can_or_cannot_enter_vehicle", "[volume]" )
Expand Down
Loading