Merge pull request #50390 from BrettDong/dps

Update expected DPS values in test
CleverRaven · Aug 2, 2021 · 8b336f1 · 8b336f1
2 parents a96f069 + 97f9f05
commit 8b336f1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -327,8 +327,6 @@ STRIP = $(CROSS)strip
 RC  = $(CROSS)windres
 AR  = $(CROSS)ar
 
-# We don't need scientific precision for our math functions, this lets them run much faster.
-CXXFLAGS += -ffast-math
 LDFLAGS += $(PROFILE)
 
 ifneq ($(SANITIZE),)

diff --git a/android/app/jni/src/Android.mk b/android/app/jni/src/Android.mk
@@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES := libhidapi SDL2 SDL2_mixer SDL2_image SDL2_ttf libintl-
 
 LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog
 
-LOCAL_CFLAGS += -DTILES=1 -DSDL_SOUND=1 -DBACKTRACE=1 -DLOCALIZE=1 -Wextra -Wall -fsigned-char -ffast-math
+LOCAL_CFLAGS += -DTILES=1 -DSDL_SOUND=1 -DBACKTRACE=1 -DLOCALIZE=1 -Wextra -Wall -fsigned-char
 
 LOCAL_LDFLAGS += $(LOCAL_CFLAGS)
 

diff --git a/tests/creature_effect_test.cpp b/tests/creature_effect_test.cpp
@@ -541,27 +541,6 @@ TEST_CASE( "character is_immune_effect", "[creature][character][effect][immune]"
             }
         }
     }
-
-    WHEN( "character has Strong Stomach mutation" ) {
-        const trait_id trait_strong_stomach( "STRONGSTOMACH" );
-        const efftype_id effect_nausea( "nausea" );
-
-        dummy.toggle_trait( trait_strong_stomach );
-        REQUIRE( dummy.has_trait( trait_strong_stomach ) );
-
-        THEN( "they are immune to the nausea effect" ) {
-            CHECK( dummy.is_immune_effect( effect_nausea ) );
-        }
-
-        AND_WHEN( "they lose their Strong Stomach mutation" ) {
-            dummy.toggle_trait( trait_strong_stomach );
-            REQUIRE_FALSE( dummy.has_trait( trait_strong_stomach ) );
-
-            THEN( "they are no longer immune to the nausea effect" ) {
-                CHECK_FALSE( dummy.is_immune_effect( effect_nausea ) );
-            }
-        }
-    }
 }
 
 // Creature::resists_effect

diff --git a/tests/effective_dps_test.cpp b/tests/effective_dps_test.cpp
@@ -405,14 +405,14 @@ static void check_clubs( const std::function<Approx( const std::string & )> &cal
         CHECK( calc_expected_dps( "shillelagh" ) == 20.0 );
         CHECK( calc_expected_dps( "bokken" ) == 20.0 );
         CHECK( calc_expected_dps( "PR24-extended" ) == 20.0 );
-        CHECK( calc_expected_dps( "mace_inferior" ) == 17.5 );
+        CHECK( calc_expected_dps( "mace_inferior" ) == 18.5 );
         CHECK( calc_expected_dps( "tonfa" ) == 17.0 );
         CHECK( calc_expected_dps( "tonfa_wood" ) == 16.0 );
         CHECK( calc_expected_dps( "shocktonfa_off" ) == 16.0 );
         CHECK( calc_expected_dps( "shocktonfa_on" ) == 16.0 );
         CHECK( calc_expected_dps( "crowbar" ) == 15.0 );
         CHECK( calc_expected_dps( "morningstar_inferior" ) == 15.0 );
-        CHECK( calc_expected_dps( "bokken_inferior" ) == 13.0 );
+        CHECK( calc_expected_dps( "bokken_inferior" ) == 14.0 );
         CHECK( calc_expected_dps( "golf_club" ) == 14.0 );
         CHECK( calc_expected_dps( "mace_fake" ) == 13.0 );
         CHECK( calc_expected_dps( "claw_bar" ) == 11.0 );
@@ -493,10 +493,10 @@ static void check_shortswords( const std::function<Approx( const std::string & )
         CHECK( calc_expected_dps( "machete" ) == 20.0 );
         CHECK( calc_expected_dps( "dao" ) == 18.0 );
         CHECK( calc_expected_dps( "sword_cane" ) == 17.5 );
-        CHECK( calc_expected_dps( "cutlass_inferior" ) == 16.5 );
+        CHECK( calc_expected_dps( "cutlass_inferior" ) == 17.5 );
         CHECK( calc_expected_dps( "scimitar_inferior" ) == 14.5 );
         CHECK( calc_expected_dps( "sword_crude" ) == 14.0 );
-        CHECK( calc_expected_dps( "wakizashi_inferior" ) == 14.0 );
+        CHECK( calc_expected_dps( "wakizashi_inferior" ) == 15.0 );
         CHECK( calc_expected_dps( "makeshift_machete" ) == 11.0 );
         CHECK( calc_expected_dps( "cavalry_sabre_fake" ) == 7.5 );
         CHECK( calc_expected_dps( "cutlass_fake" ) == 7.75 );
@@ -520,7 +520,7 @@ static void check_knives( const std::function<Approx( const std::string & )> &ca
         CHECK( calc_expected_dps( "tanto" ) == 18.0 );
         CHECK( calc_expected_dps( "kris" ) == 18.0 );
         CHECK( calc_expected_dps( "knife_rambo" ) == 17.0 );
-        CHECK( calc_expected_dps( "tanto_inferior" ) == 15.0 );
+        CHECK( calc_expected_dps( "tanto_inferior" ) == 16.5 );
         CHECK( calc_expected_dps( "bone_knife" ) == 12.0 );
         CHECK( calc_expected_dps( "knife_hunting" ) == 11.0 );
         CHECK( calc_expected_dps( "kirpan_cheap" ) == 10.5 );
@@ -530,7 +530,7 @@ static void check_knives( const std::function<Approx( const std::string & )> &ca
         CHECK( calc_expected_dps( "copper_knife" ) == 8.0 );
         CHECK( calc_expected_dps( "knife_butcher" ) == 7.5 );
         CHECK( calc_expected_dps( "throwing_knife" ) == 7.0 );
-        CHECK( calc_expected_dps( "tanto_fake" ) == 6.5 );
+        CHECK( calc_expected_dps( "tanto_fake" ) == 7.5 );
         CHECK( calc_expected_dps( "pockknife" ) == 4.5 );
         CHECK( calc_expected_dps( "spike" ) == 4.0 );
         CHECK( calc_expected_dps( "kris_fake" ) == 2.5 );