Ratchet down bow effective range.

data/json/items/archery.json

@@ -332,7 +332,7 @@
     "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 },
     "ranged_damage": 5,
     "range": 8,
-    "dispersion": 250,
+    "dispersion": 1250,
     "durability": 6,
     "clip_size": 1,
     "reload": 50
@@ -359,7 +359,7 @@
     "loudness": 6,
     "ranged_damage": 4,
     "range": 10,
-    "dispersion": 210,
+    "dispersion": 1000,
     "durability": 6,
     "clip_size": 1,
     "reload": 30,
@@ -387,7 +387,7 @@
     "loudness": 10,
     "ranged_damage": 18,
     "range": 18,
-    "dispersion": 100,
+    "dispersion": 850,
     "durability": 6,
     "clip_size": 1,
     "reload": 110,
@@ -408,7 +408,6 @@
     "name_plural": "compound bows (high)",
     "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by very strong archers.  Currently set to a high weight, and ready to cause some real damage - if you can draw it.",
     "min_strength": 8,
-    "dispersion": 85,
     "reload": 120,
     "ranged_damage": 22,
     "range": 22,
@@ -428,7 +427,6 @@
     "name_plural": "compound bows (low)",
     "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by average archers.  Currently set to a low weight, making it much easier to draw.",
     "min_strength": 4,
-    "dispersion": 115,
     "reload": 85,
     "ranged_damage": 14,
     "range": 14,
@@ -462,7 +460,7 @@
     "loudness": 6,
     "ranged_damage": 5,
     "range": 12,
-    "dispersion": 150,
+    "dispersion": 950,
     "durability": 6,
     "clip_size": 1,
     "reload": 35,
@@ -490,7 +488,7 @@
     "loudness": 8,
     "ranged_damage": 14,
     "range": 14,
-    "dispersion": 120,
+    "dispersion": 850,
     "durability": 6,
     "clip_size": 1,
     "reload": 90,
@@ -518,7 +516,7 @@
     "loudness": 6,
     "ranged_damage": 6,
     "range": 12,
-    "dispersion": 120,
+    "dispersion": 950,
     "durability": 6,
     "clip_size": 1,
     "reload": 40,
@@ -546,7 +544,7 @@
     "loudness": 8,
     "ranged_damage": 12,
     "range": 14,
-    "dispersion": 140,
+    "dispersion": 850,
     "durability": 6,
     "clip_size": 1,
     "reload": 80,
@@ -574,7 +572,7 @@
     "loudness": 8,
     "ranged_damage": 10,
     "range": 18,
-    "dispersion": 210,
+    "dispersion": 1000,
     "durability": 6,
     "clip_size": 1,
     "reload": 70,
@@ -591,7 +589,6 @@
     "weight": "3200 g",
     "volume": "6250 ml",
     "armor_data": { "covers": [ "TORSO" ], "coverage": 7, "material_thickness": 2, "encumbrance": 25 },
-    "dispersion": 200,
     "durability": 8,
     "reload": 100,
     "loudness": 16,
@@ -621,7 +618,7 @@
     "reload": 150,
     "ranged_damage": 40,
     "range": 22,
-    "dispersion": 100,
+    "dispersion": 1000,
     "clip_size": 1,
     "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ]
   },
@@ -647,7 +644,7 @@
     "loudness": 8,
     "ranged_damage": 8,
     "range": 18,
-    "dispersion": 120,
+    "dispersion": 950,
     "durability": 6,
     "clip_size": 1,
     "reload": 40,

data/json/items/gunmod/sights.json

@@ -13,7 +13,7 @@
     "color": "dark_gray",
     "location": "sights",
     "mod_targets": [ "bow" ],
-    "sight_dispersion": 11,
+    "sight_dispersion": 15,
     "aim_speed": 5,
     "min_skills": [ [ "archery", 2 ] ]
   },
@@ -31,8 +31,8 @@
     "color": "dark_gray",
     "location": "sights",
     "mod_targets": [ "bow" ],
-    "sight_dispersion": 22,
-    "aim_speed": 7
+    "sight_dispersion": 25,
+    "aim_speed": 8
   },
   {
     "id": "bow_scope",
@@ -48,7 +48,7 @@
     "color": "dark_gray",
     "location": "sights",
     "mod_targets": [ "bow" ],
-    "sight_dispersion": 1,
+    "sight_dispersion": 10,
     "aim_speed": 2,
     "min_skills": [ [ "archery", 3 ] ],
     "flags": [ "ZOOM" ]

src/character.cpp

@@ -484,6 +484,8 @@ double Character::aim_cap_from_volume( const item &gun ) const
         aim_cap = std::max( 15.0, aim_cap * 1.25 );
     } else if( gun_skill == "rifle" ) {
         aim_cap = std::max( 7.0, aim_cap - 5.0 );
+    } else if( gun_skill == "archery" ) {
+        aim_cap = std::max( 13.0, aim_cap );
     } else { // Launchers, etc.
         aim_cap = std::max( 10.0, aim_cap );
     }

tests/ranged_balance_test.cpp

@@ -259,8 +259,8 @@ TEST_CASE( "unskilled_shooter_accuracy", "[ranged] [balance]" )
         test_fast_shooting( shooter, 40, 0.3 );
     }
     SECTION( "an unskilled archer with an inaccurate bow" ) {
-        arm_shooter( shooter, "shortbow" );
-        test_shooting_scenario( shooter, 4, 5, 18 );
+        arm_shooter( shooter, "shortbow", { "bow_sight_pin" } );
+        test_shooting_scenario( shooter, 3, 3, 12 );
         test_fast_shooting( shooter, 50, 0.2 );
     }
     SECTION( "an unskilled shooter with an inaccurate shotgun" ) {
@@ -293,8 +293,8 @@ TEST_CASE( "competent_shooter_accuracy", "[ranged] [balance]" )
         test_fast_shooting( shooter, 30, 0.5 );
     }
     SECTION( "a skilled archer with an accurate bow" ) {
-        arm_shooter( shooter, "recurbow", { "bow_sight_pin" } );
-        test_shooting_scenario( shooter, 12, 18, 40 );
+        arm_shooter( shooter, "recurbow", { "bow_sight" } );
+        test_shooting_scenario( shooter, 8, 10, 32 );
         test_fast_shooting( shooter, 50, 0.4 );
     }
     SECTION( "a skilled shooter with an accurate shotgun" ) {
@@ -328,8 +328,8 @@ TEST_CASE( "expert_shooter_accuracy", "[ranged] [balance]" )
     }
     SECTION( "an expert archer with an excellent bow" ) {
         arm_shooter( shooter, "compbow_high", { "bow_scope" } );
-        test_shooting_scenario( shooter, 20, 60, 400 );
-        test_fast_shooting( shooter, 40, 0.6 );
+        test_shooting_scenario( shooter, 12, 20, 80 );
+        test_fast_shooting( shooter, 30, 0.6 );
     }
     SECTION( "an expert shooter with an excellent shotgun" ) {
         arm_shooter( shooter, "m1014", { "holo_sight" } );