Merge pull request #72684 from nornagon/no-regenerate-in-sunlight

no regenerates_in_dark in sunlight
CleverRaven · May 24, 2024 · 120fde4 · 120fde4
1 parent ae6d2b2
commit 120fde4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/monster.cpp b/src/monster.cpp
@@ -3167,7 +3167,7 @@ void monster::process_effects()
         add_msg_if_player_sees( *this, m_warning, healing_format_string, name() );
     }
 
-    if( type->regenerates_in_dark ) {
+    if( type->regenerates_in_dark && !g->is_in_sunlight( pos() ) ) {
         const float light = get_map().ambient_light_at( pos() );
         // Magic number 10000 was chosen so that a floodlight prevents regeneration in a range of 20 tiles
         const float dHP = 50.0 * std::exp( - light * light / 10000 );