Commit for remote

src/ballistics.cpp

@@ -211,7 +211,7 @@ dealt_projectile_attack projectile_attack( const projectile &proj_arg, const tri
     map &here = get_map();
     double target_size = target_critter != nullptr ?
                          target_critter->ranged_target_size() :
-                         here.ranged_target_size( target_arg );
+                         here.ranged_target_size( target_arg, range );
     projectile_attack_aim aim = projectile_attack_roll( dispersion, range, target_size );
 
     // TODO: move to-hit roll back in here

src/map.cpp

@@ -2018,7 +2018,7 @@ bool map::valid_move( const tripoint &from, const tripoint &to,
 
 // End of move cost
 
-double map::ranged_target_size( const tripoint &p ) const
+double map::ranged_target_size( const tripoint &p, double range ) const
 {
     if( impassable( p ) ) {
         return 1.0;
@@ -2028,7 +2028,12 @@ double map::ranged_target_size( const tripoint &p ) const
         return 0.0;
     }
 
-    // TODO: Handle cases like shrubs, trees, furniture, sandbags...
+    // Coverage of furniture like sandbags gives X% chance to intercept a shot
+    // Does not apply if you're adjacent, it's assumed you're firing over it
+    if( x_in_y( coverage( p ), 100 ) && range > 1 ) {
+        return 1.0;
+    }
+
     return 0.1;
 }
 

src/map.h

@@ -603,8 +603,10 @@ class map
          * Size of map objects at `p` for purposes of ranged combat.
          * Size is in percentage of tile: if 1.0, all attacks going through tile
          * should hit map objects on it, if 0.0 there is nothing to be hit (air/water).
+         * Coverage value of furniture adds a percent chance to intercept shots
+         * unless shooter is adjacent to it.
          */
-        double ranged_target_size( const tripoint &p ) const;
+        double ranged_target_size( const tripoint &p, double range ) const;
 
         // Sees:
         /**