Hamster Huey and the Gooey Kablooie: Mk 211 Raufoss and .50 BMG nerfs. (

#34931)

data/json/itemgroups/ammo.json

@@ -178,7 +178,9 @@
       [ "3006", 20 ],
       [ "50_incendiary", 10 ],
       [ "50bmg", 30 ],
+      [ "50match", 30 ],
       [ "50ss", 10 ],
+      [ "50_mk211", 1 ],
       [ "556_incendiary", 15 ],
       [ "556", 85 ],
       [ "762_51_incendiary", 10 ],

data/json/itemgroups/item_groups.json

@@ -5169,6 +5169,8 @@
       [ "m134", 1 ],
       [ "m107a1", 8 ],
       [ "50bmg", 12 ],
+      [ "50match", 4 ],
+      [ "50_mk211", 1 ],
       [ "50ss", 8 ],
       [ "50_incendiary", 8 ],
       [ "8mm_fmj", 6 ],
@@ -6236,6 +6238,8 @@
       [ "bipod", 1 ],
       [ "50bmg", 3 ],
       [ "50ss", 2 ],
+      [ "50match", 1 ],
+      [ "50_mk211", 1 ],
       [ "small_repairkit", 10 ],
       [ "50_incendiary", 2 ],
       [ "water_clean", 90 ],

data/json/items/ammo/50.json

@@ -3,17 +3,17 @@
     "id": "50_incendiary",
     "copy-from": "50bmg",
     "type": "AMMO",
-    "name": ".50 BMG tracer",
-    "description": "A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to help keep the weapon they are fired from on target at the risk of igniting flammable substances.",
+    "name": ".50 BMG M17 tracer",
+    "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep the weapon they are fired from on target at the risk of igniting flammable substances.",
     "count": 10,
     "effects": [ "INCENDIARY" ],
-    "proportional": { "dispersion": 0.8 }
+    "dispersion": 310
   },
   {
     "id": "50bmg",
     "type": "AMMO",
-    "name": ".50 BMG Ball",
-    "description": "The .50 BMG is a very powerful rifle round designed for long-range use.  Its stupendous accuracy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
+    "name": ".50 BMG M33 Ball",
+    "description": ".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
     "weight": "114 g",
     "volume": "250 ml",
     "price": 2200,
@@ -28,35 +28,59 @@
     "range": 110,
     "damage": 131,
     "pierce": 28,
-    "dispersion": 30,
+    "dispersion": 150,
     "recoil": 26250,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
   },
+  {
+    "id": "50match",
+    "copy-from": "50bmg",
+    "type": "AMMO",
+    "name": ".50 BMG Match",
+    "description": ".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for long-range competition shooting or other precision rifle use.",
+    "count": 10,
+    "relative": { "damage": 2, "pierce": -4 },
+    "dispersion": 100
+  },
   {
     "id": "50ss",
     "copy-from": "50bmg",
     "type": "AMMO",
-    "name": ".50 BMG AP",
+    "name": ".50 BMG M2 AP",
     "description": "Variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel.  Penetration is increased, but damage is reduced.",
     "count": 10,
-    "relative": { "damage": -10, "pierce": 20 }
+    "relative": { "damage": -10, "pierce": 20 },
+    "dispersion": 600
+  },
+  {
+    "id": "50_mk211",
+    "copy-from": "50bmg",
+    "type": "AMMO",
+    "name": ".50 BMG Raufoss Mk 211",
+    "price": 60000,
+    "price_postapoc": 120000,
+    "description": "This variant of the .50 BMG round makes the most of the caliber's potential payload delivery: the tip is loaded with an incendiary mix, which ignites on impact, detonating the RDX or PETN charge.  This also ignites a secondary zirconium powder incendiary charge that surrounds a tungsten carbide penetrator, both encased by a mild steel cup.  Fragments from the cup and burning metallic powder follow the penetrator through armored targets, increasing lethality.  These rare, complicated, and expensive rounds are not likely to be manufactured again; use them wisely.",
+    "effects": [ "INCENDIARY", "EXPLOSIVE_RAUFOSS" ],
+    "//": "mk 211 is estimated to be as effective as 20mm, which would have 65kJ energy, or 255 damage. ~181 damage is fair.",
+    "relative": { "damage": 50, "pierce": 20 },
+    "dispersion": 100
   },
   {
     "id": "reloaded_50_incendiary",
     "copy-from": "50_incendiary",
     "type": "AMMO",
     "name": "reloaded .50 BMG tracer",
-    "description": "A tracer variant of the powerful .50 BMG sniper round.  Tracer rounds to help keep the weapon they are fired from on target at the risk of igniting flammable substances.  This one has been hand-reloaded.",
+    "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds to help keep the weapon they are fired from on target at the risk of igniting flammable substances.  This one has been hand-reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
     "id": "reloaded_50bmg",
-    "copy-from": "50bmg",
+    "copy-from": "50match",
     "type": "AMMO",
-    "name": "reloaded .50 BMG Ball",
-    "description": "The .50 BMG is a very powerful rifle round designed for long-range use.  Its stupendous accuracy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.  This one has been hand-reloaded.",
+    "name": "reloaded .50 BMG Match",
+    "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -66,7 +90,7 @@
     "copy-from": "50ss",
     "type": "AMMO",
     "name": "reloaded .50 BMG AP",
-    "description": "Variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded.",
+    "description": "Variant of the .50 BMG round that uses a core hardened steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded.",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }

data/json/items/gun/50.json

@@ -16,7 +16,7 @@
     "ammo": "50",
     "range": 100,
     "ranged_damage": -5,
-    "dispersion": 90,
+    "dispersion": 130,
     "durability": 8,
     "barrel_length": 5,
     "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
@@ -40,7 +40,7 @@
     "ammo": "50",
     "skill": "rifle",
     "range": 110,
-    "dispersion": 200,
+    "dispersion": 250,
     "durability": 8,
     "reload": 400,
     "barrel_length": 5,

src/projectile.cpp

@@ -91,6 +91,11 @@ void projectile::unset_custom_explosion()
 
 void apply_ammo_effects( const tripoint &p, const std::set<std::string> &effects )
 {
+    if( effects.count( "EXPLOSIVE_RAUFOSS" ) > 0 ) {
+        // TODO: Make this actually fill a ~4m radius circle with fire and 20 shrapnel bits.  Or better, a 30 deg, 15m long arc.
+        explosion_handler::explosion( p, 2.4, 0.6, true, 28, 1.4 );
+    }
+
     if( effects.count( "EXPLOSIVE_SMALL" ) > 0 ) {
         // TODO: double-check if this is sensible.
         explosion_handler::explosion( p, 360, 0.4 );