Merge pull request #83305 from CleverRaven/debug-out-for-failing-test

Author: Maleclypse

src/npcmove.cpp

@@ -4140,7 +4140,7 @@ item *npc::evaluate_best_weapon() const
     double best_value = evaluate_weapon( weap );
 
     // To prevent changing to barely better stuff
-    best_value *= std::max<float>( 1.0f, ai_cache.danger_assessment / 10.0f );
+    best_value *= std::max<float>( 1.0f, std::min<float>( 2.0, ai_cache.danger_assessment / 10.0f ) );
 
     // Fists aren't checked below
     double fist_value = evaluate_weapon( null_item_reference() );

tests/npc_test.cpp

@@ -670,7 +670,10 @@ TEST_CASE( "npc_prefers_guns", "[npc_ai]" )
     hostile.regen_ai_cache();
     float danger_around = hostile.danger_assessment();
     CHECK( danger_around > 1.0f );
+    CAPTURE( hostile.evaluate_weapon( null_item_reference() ) );
+    CAPTURE( hostile.evaluate_weapon( item( itype_bat ) ) );
     hostile.wield_better_weapon();
+    REQUIRE( hostile.get_wielded_item() );
     CAPTURE( hostile.get_wielded_item().get_item()->tname() );
     CHECK( !hostile.get_wielded_item().get_item()->is_gun() );
     // Now give them a gun and some magazines