.40sw Ballistics by the Inch (CleverRaven#70022)

* .40sw stuff * Update 40.json
zdlpoppa · Dec 7, 2023 · f971570 · f971570
1 parent de95aef
commit f971570
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 12 deletions.
diff --git a/data/json/items/ammo/40.json b/data/json/items/ammo/40.json
@@ -1,17 +1,9 @@
 [
   {
     "id": "40fmj",
-    "copy-from": "40sw",
     "type": "AMMO",
     "name": { "str_sp": ".40 S&W FMJ" },
-    "description": ".40 S&W ammunition with a 180gr FMJ bullet.  Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.",
-    "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 } }
-  },
-  {
-    "id": "40sw",
-    "type": "AMMO",
-    "name": { "str_sp": ".40 S&W JHP" },
-    "description": ".40 S&W ammunition with a 135gr JHP bullet.  The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil.",
+    "description": ".40 S&W ammunition with a 180gr FMJ bullet.  The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil.  It was popular amongst law enforcement before the FBI switched to 9mm.",
     "ascii_picture": "40sw",
     "weight": "15 g",
     "volume": "106 ml",
@@ -27,11 +19,45 @@
     "ammo_type": "40",
     "casing": "40_casing",
     "range": 14,
-    "damage": { "damage_type": "bullet", "amount": 26, "armor_penetration": 4 },
+    "//": ".400in 165gr Speer TMJ 4410, 8.59gr Hodgdon HS-6",
+    "damage": {
+      "damage_type": "bullet",
+      "amount": 27,
+      "armor_penetration": 10,
+      "barrels": [
+        { "barrel_length": "27 mm", "amount": 18 },
+        { "barrel_length": "33 mm", "amount": 19 },
+        { "barrel_length": "38 mm", "amount": 20 },
+        { "barrel_length": "44 mm", "amount": 21 },
+        { "barrel_length": "51 mm", "amount": 22 },
+        { "barrel_length": "63 mm", "amount": 23 },
+        { "barrel_length": "74 mm", "amount": 24 },
+        { "barrel_length": "88 mm", "amount": 25 },
+        { "barrel_length": "104 mm", "amount": 26 },
+        { "barrel_length": "133 mm", "amount": 27 },
+        { "barrel_length": "161 mm", "amount": 28 },
+        { "barrel_length": "198 mm", "amount": 29 },
+        { "barrel_length": "245 mm", "amount": 30 },
+        { "barrel_length": "307 mm", "amount": 31 },
+        { "barrel_length": "425 mm", "amount": 32 },
+        { "barrel_length": "554 mm", "amount": 33 },
+        { "barrel_length": "739 mm", "amount": 34 },
+        { "barrel_length": "1107 mm", "amount": 35 },
+        { "barrel_length": "1255 mm", "amount": 36 }
+      ]
+    },
     "dispersion": 50,
     "recoil": 560,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "40sw",
+    "copy-from": "40fmj",
+    "type": "AMMO",
+    "name": { "str_sp": ".40 S&W JHP" },
+    "description": ".40 S&W ammunition with a 135gr JHP bullet.  The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil.  It was popular amongst law enforcement before the FBI switched to 9mm.",
+    "relative": { "damage": { "damage_type": "bullet", "amount": 3, "armor_penetration": -6 } }
+  },
   {
     "id": "bp_40fmj",
     "copy-from": "40fmj",

diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
@@ -43,7 +43,6 @@
     "color": "dark_gray",
     "ammo": [ "40" ],
     "skill": "pistol",
-    "ranged_damage": { "damage_type": "bullet", "amount": 1 },
     "dispersion": 480,
     "durability": 6,
     "blackpowder_tolerance": 48,
@@ -109,7 +108,6 @@
     "color": "brown",
     "ammo": [ "40" ],
     "skill": "rifle",
-    "ranged_damage": { "damage_type": "bullet", "amount": 1 },
     "dispersion": 550,
     "durability": 6,
     "blackpowder_tolerance": 60,