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

Rename fatigue to sleepiness #72708

Merged
merged 14 commits into from
Apr 5, 2024
Prev Previous commit
some clang fizes
I-am-Erk committed Apr 4, 2024
commit f2ed412eaa6e40d075d3fbfab4eb4d189fda4d87
2 changes: 1 addition & 1 deletion src/field_type.cpp
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@ const field_type_str_id fd_dazzling( "fd_dazzling" );
const field_type_str_id fd_electricity( "fd_electricity" );
const field_type_str_id fd_electricity_unlit( "fd_electricity_unlit" );
const field_type_str_id fd_extinguisher( "fd_extinguisher" );
const field_type_str_id fd_reality_tear( "fd_reality_tear" );
const field_type_str_id fd_fire( "fd_fire" );
const field_type_str_id fd_fire_vent( "fd_fire_vent" );
const field_type_str_id fd_flame_burst( "fd_flame_burst" );
@@ -47,6 +46,7 @@ const field_type_str_id fd_last_known( "fd_last_known" );
const field_type_str_id fd_nuke_gas( "fd_nuke_gas" );
const field_type_str_id fd_plasma( "fd_plasma" );
const field_type_str_id fd_push_items( "fd_push_items" );
const field_type_str_id fd_reality_tear( "fd_reality_tear" );
const field_type_str_id fd_relax_gas( "fd_relax_gas" );
const field_type_str_id fd_sap( "fd_sap" );
const field_type_str_id fd_shock_vent( "fd_shock_vent" );
2 changes: 1 addition & 1 deletion tests/widget_test.cpp
Original file line number Diff line number Diff line change
@@ -84,7 +84,6 @@ static const widget_id widget_test_compass_legend_3( "test_compass_legend_3" );
static const widget_id widget_test_compass_legend_5( "test_compass_legend_5" );
static const widget_id widget_test_dex_color_num( "test_dex_color_num" );
static const widget_id widget_test_disabled_when_empty( "test_disabled_when_empty" );
static const widget_id widget_test_sleepiness_clause( "test_sleepiness_clause" );
static const widget_id widget_test_focus_num( "test_focus_num" );
static const widget_id widget_test_health_clause( "test_health_clause" );
static const widget_id widget_test_health_color_num( "test_health_color_num" );
@@ -109,6 +108,7 @@ static const widget_id widget_test_overmap_3x3_text( "test_overmap_3x3_text" );
static const widget_id widget_test_per_color_num( "test_per_color_num" );
static const widget_id widget_test_pool_graph( "test_pool_graph" );
static const widget_id widget_test_rad_badge_text( "test_rad_badge_text" );
static const widget_id widget_test_sleepiness_clause( "test_sleepiness_clause" );
static const widget_id widget_test_speed_num( "test_speed_num" );
static const widget_id widget_test_stamina_graph( "test_stamina_graph" );
static const widget_id widget_test_stamina_num( "test_stamina_num" );

Unchanged files with check annotations Beta

" Acid: <color_c_yellow>9.00</color>\n"
" Fire: <color_c_yellow>1.00</color>\n"
" Environmental: <color_c_yellow>20</color>\n"
);

Check failure on line 1304 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
}
SECTION( "check that material resistances are properly overriden" ) {
" Acid: <color_c_yellow>9.00</color>\n"
" Fire: <color_c_yellow>2.00</color>\n"
" Environmental: <color_c_yellow>10</color>\n"
);

Check failure on line 1328 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
}
SECTION( "complex protection from physical and environmental damage" ) {
" Cut: <color_c_red>1.00</color>, <color_c_yellow>12.00</color>, <color_c_green>23.00</color>\n"
" Ballistic: <color_c_red>1.00</color>, <color_c_yellow>8.50</color>, <color_c_green>16.00</color>\n"
" Pierce: <color_c_red>0.80</color>, <color_c_yellow>9.60</color>, <color_c_green>18.40</color>\n"
);

Check failure on line 1350 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
}
SECTION( "pet armor with good physical and environmental protection" ) {
" Acid: <color_c_yellow>5.00</color>\n"
" Fire: <color_c_yellow>3.00</color>\n"
" Environmental: <color_c_yellow>10</color>\n"
);

Check failure on line 1370 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
}
}
" Fire: <color_c_yellow>1.50</color>\n"
" Environmental: <color_c_yellow>6</color>\n";
CHECK( a_str == info_str );

Check failure on line 3005 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
CHECK( a_copy_str == info_str );

Check failure on line 3006 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
CHECK( a_copy_w_armor_str == info_str );

Check failure on line 3007 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
const std::string info_prop_str =
"--\n"
" Fire: <color_c_yellow>1.75</color>\n"
" Environmental: <color_c_yellow>7</color>\n";
CHECK( a_copy_prop_str == info_prop_str );

Check failure on line 3023 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
CHECK( a_copy_w_armor_prop_str == info_prop_str );

Check failure on line 3024 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
const std::string info_rel_str =
"--\n"
" Fire: <color_c_yellow>2.00</color>\n"
" Environmental: <color_c_yellow>8</color>\n";
CHECK( a_copy_rel_str == info_rel_str );

Check failure on line 3040 in tests/iteminfo_test.cpp

GitHub Actions / Clang 12, Ubuntu, Tiles, ASan

"--
CHECK( a_copy_w_armor_rel_str == info_rel_str );
}