Blackpowder loads, part 2 (#34054)

CleverRaven · Sep 25, 2019 · 3ba9027 · 3ba9027
1 parent 922037a
commit 3ba9027
Show file tree

Hide file tree

Showing 21 changed files with 541 additions and 0 deletions.
diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json
@@ -22,6 +22,15 @@
     "recoil": 750,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_10mm_fmj",
+    "copy-from": "10mm_fmj",
+    "type": "AMMO",
+    "name": "10mm Auto 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_10mm_fmj",
     "copy-from": "10mm_fmj",

diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json
@@ -54,6 +54,24 @@
     "proportional": { "range": 0.6, "damage": 0.5, "recoil": 0.5 },
     "extend": { "effects": [ "SHOT", "NOGIB" ] }
   },
+  {
+    "id": "bp_22_fmj",
+    "copy-from": "22_fmj",
+    "type": "AMMO",
+    "name": ".22 LR FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_22_lr",
+    "copy-from": "22_lr",
+    "type": "AMMO",
+    "name": ".22 LR blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_22_lr",
     "copy-from": "22_lr",

diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json
@@ -42,6 +42,33 @@
     "description": "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
+  {
+    "id": "bp_223",
+    "copy-from": "223",
+    "type": "AMMO",
+    "name": ".223 Remington blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_556",
+    "copy-from": "556",
+    "type": "AMMO",
+    "name": "5.56 NATO blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_556_incendiary",
+    "copy-from": "556_incendiary",
+    "type": "AMMO",
+    "name": "5.56 NATO tracer blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_223",
     "copy-from": "223",

diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json
@@ -22,6 +22,15 @@
     "recoil": 3800,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
   },
+  {
+    "id": "bp_270win_jsp",
+    "copy-from": "270win_jsp",
+    "type": "AMMO",
+    "name": ".270 Winchester JSP blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.7, "recoil": 0.7, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_270win_jsp",
     "copy-from": "270win_jsp",

diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json
@@ -22,6 +22,15 @@
     "recoil": 5300,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_300_winmag",
+    "copy-from": "300_winmag",
+    "type": "AMMO",
+    "name": ".300 Winchester 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_300_winmag",
     "copy-from": "300_winmag",

diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json
@@ -38,6 +38,33 @@
     "description": "Armor piercing .30-06 M2 ammunition with 168gr FMJ bullets.  It is an extremely powerful and accurate cartridge but pays for its armor penetration abilities with lowered damage.",
     "relative": { "damage": -4, "pierce": 8 }
   },
+  {
+    "id": "bp_3006",
+    "copy-from": "3006",
+    "type": "AMMO",
+    "name": ".30-06 Springfield 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_3006_incendiary",
+    "copy-from": "3006_incendiary",
+    "type": "AMMO",
+    "name": ".30-06 Springfield tracer 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_3006fmj",
+    "copy-from": "bp_3006",
+    "type": "AMMO",
+    "name": ".30-06 Springfield M2 AP 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_3006",
     "copy-from": "3006",

diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json
@@ -33,6 +33,15 @@
     "damage": 26,
     "recoil": 1700
   },
+  {
+    "id": "bp_300blk",
+    "copy-from": "300blk",
+    "type": "AMMO",
+    "name": ".300 AAC Blackout 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_300blk",
     "copy-from": "300blk",

diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json
@@ -41,6 +41,33 @@
     "description": "This ammunition is a one-in-five mix of M80 and M62 tracer rounds to help keep the weapon they are fired from on target.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
+  {
+    "id": "bp_308",
+    "copy-from": "308",
+    "type": "AMMO",
+    "name": ".308 Winchester 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_762_51",
+    "copy-from": "762_51",
+    "type": "AMMO",
+    "name": "7.62x51mm 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_762_51_incendiary",
+    "copy-from": "762_51_incendiary",
+    "type": "AMMO",
+    "name": "7.62x51mm tracer 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_308",
     "copy-from": "308",

diff --git a/data/json/items/ammo/357mag.json b/data/json/items/ammo/357mag.json
@@ -30,6 +30,24 @@
     "description": "Jacketed hollow point .357 magnum ammunition.  The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
     "relative": { "damage": 4, "pierce": -2 }
   },
+  {
+    "id": "bp_357mag_fmj",
+    "copy-from": "357mag_fmj",
+    "type": "AMMO",
+    "name": ".357 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" ] }
+  },
+  {
+    "id": "bp_357mag_jhp",
+    "copy-from": "357mag_jhp",
+    "type": "AMMO",
+    "name": ".357 Magnum 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_357mag_fmj",
     "copy-from": "357mag_fmj",

diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json
@@ -102,6 +102,7 @@
     "reload": 150,
     "extend": { "flags": [ "RELOAD_ONE", "NO_UNLOAD" ] },
     "//": "Slower reloads, no unloading.  Base, unskilled person should take 1.5 seconds per chamber.  No underbarrel mods, that's where the ram goes.",
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "barrel", 1 ],

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -19,6 +19,7 @@
     "ranged_damage": 4,
     "dispersion": 280,
     "durability": 6,
+    "min_cycle_recoil": 39,
     "burst": 20,
     "barrel_length": 1,
     "valid_mod_locations": [
@@ -35,6 +36,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
     "magazines": [ [ "22", [ "a180mag" ] ] ]
   },
   {
@@ -57,6 +59,7 @@
     "ranged_damage": 5,
     "dispersion": 90,
     "durability": 8,
+    "blackpowder_tolerance": 56,
     "clip_size": 19,
     "magazines": [ [ "22", [ "marlin_tubeloader" ] ] ],
     "valid_mod_locations": [
@@ -73,6 +76,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
     "flags": [ "RELOAD_ONE" ]
   },
   {
@@ -93,6 +97,7 @@
     "ranged_damage": -2,
     "dispersion": 520,
     "durability": 6,
+    "blackpowder_tolerance": 96,
     "clip_size": 4,
     "valid_mod_locations": [
       [ "accessories", 2 ],
@@ -104,6 +109,7 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
     "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
   },
   {
@@ -126,6 +132,7 @@
     "ranged_damage": 1,
     "dispersion": 550,
     "durability": 6,
+    "blackpowder_tolerance": 60,
     "loudness": 25,
     "clip_size": 1,
     "reload": 200,
@@ -140,6 +147,7 @@
       [ "sights mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
     "flags": [ "RELOAD_EJECT" ]
   },
   {
@@ -161,6 +169,8 @@
     "ranged_damage": 3,
     "dispersion": 220,
     "durability": 9,
+    "blackpowder_tolerance": 24,
+    "min_cycle_recoil": 39,
     "burst": 20,
     "reload": 500,
     "valid_mod_locations": [
@@ -174,6 +184,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
     "magazines": [ [ "22", [ "360_200_mag", "360_400_mag" ] ] ],
     "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ]
   },
@@ -197,6 +208,7 @@
     "ranged_damage": 4,
     "dispersion": 110,
     "durability": 8,
+    "min_cycle_recoil": 39,
     "barrel_length": 2,
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -212,6 +224,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
     "magazine_well": 1,
     "magazines": [ [ "22", [ "ruger1022mag", "ruger1022bigmag" ] ] ]
   },
@@ -245,6 +258,7 @@
     "ranged_damage": -1,
     "dispersion": 480,
     "durability": 8,
+    "min_cycle_recoil": 39,
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "barrel", 1 ],
@@ -258,6 +272,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
     "magazine_well": 1,
     "magazines": [ [ "22", [ "mosquitomag" ] ] ]
   },
@@ -278,6 +293,7 @@
     "ammo": "22",
     "dispersion": 480,
     "durability": 7,
+    "min_cycle_recoil": 39,
     "magazine_well": 1,
     "magazines": [ [ "22", [ "sw22mag" ] ] ]
   },
@@ -297,6 +313,8 @@
     "ammo": "22",
     "dispersion": 600,
     "durability": 5,
+    "min_cycle_recoil": 39,
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
     "magazines": [ [ "22", [ "j22mag" ] ] ]
   },
   {
@@ -315,6 +333,7 @@
     "ammo": "22",
     "dispersion": 480,
     "durability": 7,
+    "min_cycle_recoil": 39,
     "magazine_well": 1,
     "magazines": [ [ "22", [ "wp22mag" ] ] ]
   }