Falling into deep water deals less damage (#39903)

CleverRaven · May 4, 2020 · 5de957a · 5de957a
1 parent 8b4a4e2
commit 5de957a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/player.cpp b/src/player.cpp
@@ -1276,8 +1276,12 @@ int player::impact( const int force, const tripoint &p )
         if( g->m.has_furn( p ) ) {
             // TODO: Make furniture matter
         } else if( g->m.has_flag( TFLAG_SWIMMABLE, p ) ) {
-            // TODO: Some formula of swimming
-            effective_force /= 4;
+            const int swim_skill = get_skill_level( skill_swimming );
+            effective_force /= 4.0f + 0.1f * swim_skill;
+            if( g->m.has_flag( TFLAG_DEEP_WATER, p ) ) {
+                effective_force /= 1.5f;
+                mod /= 1.0f + ( 0.1f * swim_skill );
+            }
         }
     }
 
@@ -4420,4 +4424,3 @@ bool player::query_yn( const std::string &mes ) const
 {
     return ::query_yn( mes );
 }
-