Extra blackpowder loads, part 1: Pistols (#31485)

CleverRaven · Sep 6, 2019 · 25c0373 · 25c0373
1 parent ec2d407
commit 25c0373
Show file tree

Hide file tree

Showing 39 changed files with 612 additions and 52 deletions.
diff --git a/data/json/items/ammo/32.json b/data/json/items/ammo/32.json
@@ -20,6 +20,15 @@
     "recoil": 150,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_32_acp",
+    "copy-from": "32_acp",
+    "type": "AMMO",
+    "name": ".32 ACP blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_32_acp",
     "copy-from": "32_acp",

diff --git a/data/json/items/ammo/36paper.json b/data/json/items/ammo/36paper.json
@@ -16,6 +16,6 @@
     "damage": 19,
     "dispersion": 80,
     "recoil": 210,
-    "effects": [ "COOKOFF", "MUZZLE_SMOKE" ]
+    "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
   }
 ]
diff --git a/data/json/items/ammo/38.json b/data/json/items/ammo/38.json
@@ -66,14 +66,22 @@
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
+  {
+    "id": "bp_38_fmj",
+    "copy-from": "38_fmj",
+    "type": "AMMO",
+    "name": ".38 FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "bp_38_special",
     "copy-from": "38_special",
     "type": "AMMO",
-    "name": "blackpowder .38 Special",
-    "description": "This .38 Special cartridge is loaded with a 200gr cast lead hollowpoint and 23gr of blackpowder.  While it's much slower than a regular .38, it has tremendous stopping power.",
-    "proportional": { "price": 0.6, "damage": 1.15, "dispersion": 1.3 },
-    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+    "name": ".38 Special blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }
 ]
diff --git a/data/json/items/ammo/380.json b/data/json/items/ammo/380.json
@@ -40,6 +40,24 @@
     "relative": { "damage": 4, "pierce": 2, "dispersion": -15 },
     "proportional": { "recoil": 1.1 }
   },
+  {
+    "id": "bp_380_FMJ",
+    "copy-from": "380_FMJ",
+    "type": "AMMO",
+    "name": ".380 ACP FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_380_JHP",
+    "copy-from": "380_JHP",
+    "type": "AMMO",
+    "name": ".380 ACP JHP blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_380_FMJ",
     "copy-from": "380_FMJ",

diff --git a/data/json/items/ammo/40.json b/data/json/items/ammo/40.json
@@ -29,6 +29,24 @@
     "recoil": 560,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_40fmj",
+    "copy-from": "40fmj",
+    "type": "AMMO",
+    "name": ".40 S&W FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_40sw",
+    "copy-from": "40sw",
+    "type": "AMMO",
+    "name": ".40 S&W JHP blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_40fmj",
     "copy-from": "40fmj",

diff --git a/data/json/items/ammo/44.json b/data/json/items/ammo/44.json
@@ -51,11 +51,18 @@
     "id": "bp_44magnum",
     "copy-from": "44magnum",
     "type": "AMMO",
-    "name": "blackpowder .44 Magnum",
-    "description": "This .44 Magnum cartridge is loaded with 39gr of blackpowder and a 200gr cast lead semi-wadcutter.",
-    "proportional": { "price": 0.6, "dispersion": 1.2 },
-    "pierce": 0,
-    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+    "name": ".44 Magnum blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_44fmj",
+    "copy-from": "44fmj",
+    "type": "AMMO",
+    "name": ".44 Magnum FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }
 ]
diff --git a/data/json/items/ammo/44paper.json b/data/json/items/ammo/44paper.json
@@ -16,6 +16,6 @@
     "damage": 27,
     "dispersion": 70,
     "recoil": 580,
-    "effects": [ "COOKOFF", "MUZZLE_SMOKE" ]
+    "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
   }
 ]
diff --git a/data/json/items/ammo/45.json b/data/json/items/ammo/45.json
@@ -39,6 +39,24 @@
     "count": 10,
     "relative": { "damage": 4, "pierce": 4, "dispersion": -10, "recoil": 60 }
   },
+  {
+    "id": "bp_45_acp",
+    "copy-from": "45_acp",
+    "type": "AMMO",
+    "name": ".45 ACP FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_45_jhp",
+    "copy-from": "45_jhp",
+    "type": "AMMO",
+    "name": ".45 ACP JHP blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_45_acp",
     "copy-from": "45_acp",

diff --git a/data/json/items/ammo/454.json b/data/json/items/ammo/454.json
@@ -34,10 +34,9 @@
     "id": "bp_454_Casull",
     "copy-from": "454_Casull",
     "type": "AMMO",
-    "name": "blackpowder .454 Casull",
-    "description": "This strange anachronism of a cartridge is loaded with 45gr of blackpowder and a relatively light 190gr cast lead hollowpoint.",
-    "proportional": { "price": 0.6, "dispersion": 1.3 },
-    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+    "name": ".454 Casull blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }
 ]
diff --git a/data/json/items/ammo/46.json b/data/json/items/ammo/46.json
@@ -21,12 +21,23 @@
     "recoil": 90,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_46mm",
+    "copy-from": "46mm",
+    "type": "AMMO",
+    "name": "4.6x30mm blackpowder",
+    "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+    "proportional": { "price": 0.3, "damage": 0.46, "recoil": 0.46, "pierce": 0.1, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_46mm",
     "copy-from": "46mm",
     "type": "AMMO",
     "name": "reloaded 4.6x30mm",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+    "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.2, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }

diff --git a/data/json/items/ammo/460.json b/data/json/items/ammo/460.json
@@ -17,6 +17,24 @@
     "casing": "460_casing",
     "proportional": { "range": 0.95, "damage": 0.95, "pierce": 0.95, "recoil": 0.95 }
   },
+  {
+    "id": "bp_460_fmj",
+    "copy-from": "460_fmj",
+    "type": "AMMO",
+    "name": ".460 Rowland FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_460_rowland",
+    "copy-from": "460_rowland",
+    "type": "AMMO",
+    "name": ".460 Rowland blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_460_fmj",
     "copy-from": "460_fmj",

diff --git a/data/json/items/ammo/500.json b/data/json/items/ammo/500.json
@@ -21,6 +21,15 @@
     "recoil": 3000,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_500_Magnum",
+    "copy-from": "500_Magnum",
+    "type": "AMMO",
+    "name": ".500 S&W Magnum blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_500_Magnum",
     "copy-from": "500_Magnum",

diff --git a/data/json/items/ammo/57.json b/data/json/items/ammo/57.json
@@ -21,12 +21,23 @@
     "recoil": 90,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_57mm",
+    "copy-from": "57mm",
+    "type": "AMMO",
+    "name": "5.7x28mm blackpowder",
+    "description": "5.7x28mm ammunition with 31gr AP FMJ bullets.  The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use.  Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable.  It has very low recoil but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+    "proportional": { "price": 0.3, "damage": 0.56, "recoil": 0.56, "pierce": 0.1, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_57mm",
     "copy-from": "57mm",
     "type": "AMMO",
     "name": "reloaded 5.7x28mm",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "description": "5.7x28mm ammunition with 31gr AP FMJ bullets.  The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use.  Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable.  It has very low recoil but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+    "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.2, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }

diff --git a/data/json/items/ammo/762x25.json b/data/json/items/ammo/762x25.json
@@ -41,6 +41,15 @@
     "count": 50,
     "relative": { "price": 2000, "range": -1, "damage": -9, "pierce": 2, "recoil": -270 }
   },
+  {
+    "id": "bp_762_25",
+    "copy-from": "762_25hot",
+    "type": "AMMO",
+    "name": "7.62x25mm FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_762_25",
     "copy-from": "762_25hot",

diff --git a/data/json/items/ammo/9mm.json b/data/json/items/ammo/9mm.json
@@ -55,7 +55,7 @@
     "copy-from": "9mm",
     "type": "AMMO",
     "name": "9x19mm JHP blackpowder",
-    "proportional": { "price": 0.3, "damage": 0.65, "recoil": 0.65, "pierce": 0.5, "dispersion": 1.2 },
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -64,7 +64,7 @@
     "copy-from": "9mmfmj",
     "type": "AMMO",
     "name": "9x19mm FMJ blackpowder",
-    "proportional": { "price": 0.3, "damage": 0.65, "recoil": 0.65, "pierce": 0.5, "dispersion": 1.2 },
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },

diff --git a/data/json/items/ammo/9x18.json b/data/json/items/ammo/9x18.json
@@ -41,6 +41,24 @@
     "price": 3100,
     "relative": { "damage": -2, "pierce": 8 }
   },
+  {
+    "id": "bp_9x18mm",
+    "copy-from": "9x18mm",
+    "type": "AMMO",
+    "name": "9x18mm blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_9x18mmfmj",
+    "copy-from": "9x18mmfmj",
+    "type": "AMMO",
+    "name": "9x18mm FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_9x18mm",
     "copy-from": "9x18mm",

diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json
@@ -6,7 +6,7 @@
     "name": "base gun",
     "symbol": "(",
     "color": "light_gray",
-    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ]
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ]
   },
   {
     "abstract": "flamethrower_base",
@@ -29,7 +29,8 @@
     "skill": "launcher",
     "modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ] ],
     "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "sights", 1 ], [ "sling", 1 ] ],
-    "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ]
+    "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ]
   },
   {
     "abstract": "pistol_base",
@@ -80,6 +81,7 @@
     "proportional": { "reload": 0.7 },
     "extend": { "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ] },
     "//": "Revolvers exclude the muzzle location preventing installation of suppressors",
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "barrel", 1 ],
@@ -121,6 +123,7 @@
     "name": "rifle with manual actions",
     "name_plural": "rifles with manual actions",
     "//": "Manual actions exclude the magazine location preventing installation of belt-feed adaptors",
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -176,7 +179,8 @@
     "type": "GUN",
     "name": "pump action shotgun",
     "reload_noise": "chuk chuk.",
-    "flags": [ "RELOAD_ONE", "PUMP_ACTION" ]
+    "flags": [ "RELOAD_ONE", "PUMP_ACTION" ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ]
   },
   {
     "abstract": "smg_base",