Merge pull request CleverRaven#45256 from Rail-Runner/blackpowder_loads2

Add extra blackpowder loads
sonphantrung · Nov 10, 2020 · e884feb · e884feb
2 parents 34527a6 + e2253a9
commit e884feb
Show file tree

Hide file tree

Showing 8 changed files with 211 additions and 12 deletions.
diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json
@@ -95,5 +95,47 @@
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_50_incendiary",
+    "copy-from": "50_incendiary",
+    "type": "AMMO",
+    "name": { "str": ".50 BMG tracer, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_50match",
+    "copy-from": "50match",
+    "type": "AMMO",
+    "name": { "str": ".50 BMG Match, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_50ss",
+    "copy-from": "50ss",
+    "type": "AMMO",
+    "name": { "str": ".50 BMG AP, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/data/json/items/ammo/700nx.json b/data/json/items/ammo/700nx.json
@@ -30,5 +30,19 @@
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_700nx",
+    "copy-from": "700nx",
+    "type": "AMMO",
+    "name": { "str": ".700 NX, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/data/json/items/ammo/762R.json b/data/json/items/ammo/762R.json
@@ -30,5 +30,19 @@
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_762_54R",
+    "copy-from": "762_54R",
+    "type": "AMMO",
+    "name": { "str": "7.62x54mmR, black powder" },
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "m107a1",
-    "copy-from": "rifle_base",
+    "copy-from": "rifle_semi",
     "looks_like": "ar15",
     "type": "GUN",
     "name": { "str_sp": "Barrett M107A1" },
@@ -20,6 +20,7 @@
     "ranged_damage": { "damage_type": "bullet", "amount": -5 },
     "dispersion": 130,
     "durability": 8,
+    "min_cycle_recoil": 23625,
     "barrel_volume": "1250 ml",
     "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
     "flags": [ "NEVER_JAMS" ],
@@ -35,7 +36,7 @@
   },
   {
     "id": "m2browning",
-    "copy-from": "gun_base",
+    "copy-from": "rifle_auto",
     "looks_like": "ar15",
     "type": "GUN",
     "name": { "str_sp": "M2HB Browning HMG" },
@@ -49,10 +50,10 @@
     "bashing": 12,
     "material": [ "steel" ],
     "ammo": [ "50" ],
-    "skill": "rifle",
     "range": 110,
     "dispersion": 250,
     "durability": 8,
+    "min_cycle_recoil": 23625,
     "reload": 400,
     "barrel_volume": "1250 ml",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
@@ -110,13 +111,14 @@
       "dispersion": 60,
       "barrel_volume": "-250 ml"
     },
+    "blackpowder_tolerance": 24,
     "longest_side": "130 cm",
     "flags": [ "RELOAD_EJECT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "holster": true, "rigid": true, "ammo_restriction": { "50": 1 } } ]
   },
   {
     "id": "as50",
-    "copy-from": "rifle_base",
+    "copy-from": "rifle_semi",
     "looks_like": "ar15",
     "type": "GUN",
     "name": { "str": "AI AS50" },
@@ -134,6 +136,7 @@
     "ranged_damage": { "damage_type": "bullet", "amount": -5 },
     "dispersion": 80,
     "durability": 7,
+    "min_cycle_recoil": 23625,
     "reload": 400,
     "barrel_volume": "1250 ml",
     "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
@@ -150,7 +153,7 @@
   },
   {
     "id": "tac50",
-    "copy-from": "rifle_base",
+    "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
     "name": { "str": "McMillan TAC-50" },
@@ -168,6 +171,7 @@
     "ranged_damage": { "damage_type": "bullet", "amount": -5 },
     "dispersion": 50,
     "durability": 8,
+    "blackpowder_tolerance": 24,
     "reload": 450,
     "barrel_volume": "1250 ml",
     "default_mods": [ "recoil_stock", "bipod", "rifle_scope", "muzzle_brake" ],
@@ -184,7 +188,7 @@
   },
   {
     "id": "bfg50",
-    "copy-from": "rifle_base",
+    "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
     "name": { "str": "Serbu BFG-50" },
@@ -202,10 +206,24 @@
     "ranged_damage": { "damage_type": "bullet", "amount": -5 },
     "dispersion": 110,
     "durability": 8,
+    "blackpowder_tolerance": 48,
     "barrel_volume": "1250 ml",
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
     "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
     "clip_size": 1,
-    "flags": [ "NEVER_JAMS", "RELOAD_ONE" ],
+    "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50": 1 } } ]
   }
 ]
diff --git a/data/json/items/gun/700nx.json b/data/json/items/gun/700nx.json
@@ -1,9 +1,9 @@
 [
   {
     "id": "trex_gun",
+    "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "reload_noise_volume": 10,
     "name": { "str": "Elephant gun" },
     "description": "A custom-made single shot rifle specially designed for the hunting of huge game.  You could obviously kill everything with this, EVERYTHING.  If you ever find enough ammo of course.",
     "weight": "8082 g",
@@ -14,12 +14,11 @@
     "to_hit": 1,
     "bashing": 12,
     "material": [ "steel", "wood" ],
-    "symbol": "(",
     "color": "light_blue",
     "ammo": [ "700nx" ],
-    "skill": "rifle",
     "dispersion": 90,
     "durability": 8,
+    "blackpowder_tolerance": 56,
     "clip_size": 1,
     "reload": 600,
     "barrel_volume": "1000 ml",

diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json
@@ -64,16 +64,21 @@
     "range": 3,
     "dispersion": 90,
     "durability": 10,
+    "blackpowder_tolerance": 48,
     "clip_size": 5,
     "barrel_volume": "1000 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
       [ "brass catcher", 1 ],
+      [ "grip mount", 1 ],
       [ "mechanism", 4 ],
       [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
       [ "sights", 1 ],
-      [ "sling", 1 ]
+      [ "sling", 1 ],
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
     ],
     "flags": [ "RELOAD_ONE" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "762R": 5 }, "allowed_speedloaders": [ "762R_clip" ] } ]

diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json
@@ -536,6 +536,23 @@
       [ [ "copper", 6 ] ]
     ]
   },
+  {
+    "result": "bp_50match",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 6 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ],
+    "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 158 ] ], [ [ "copper", 6 ] ] ]
+  },
   {
     "result": "reloaded_50_incendiary",
     "type": "recipe",
@@ -560,6 +577,29 @@
       [ [ "incendiary", 20 ] ]
     ]
   },
+  {
+    "result": "bp_50_incendiary",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 8 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 21 ], [ "ammo_bullet", 12 ] ],
+    "components": [
+      [ [ "50_casing", 1 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "chem_black_powder", 158 ] ],
+      [ [ "copper", 6 ] ],
+      [ [ "incendiary", 20 ] ]
+    ]
+  },
   {
     "result": "reloaded_50ss",
     "type": "recipe",
@@ -584,6 +624,29 @@
       [ [ "copper", 6 ] ]
     ]
   },
+  {
+    "result": "bp_50ss",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 8,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 7 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 21 ] ],
+    "components": [
+      [ [ "50_casing", 1 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "chem_black_powder", 158 ] ],
+      [ [ "scrap", 1 ] ],
+      [ [ "copper", 6 ] ]
+    ]
+  },
   {
     "result": "reloaded_545",
     "type": "recipe",
@@ -782,6 +845,23 @@
       [ [ "copper", 10 ] ]
     ]
   },
+  {
+    "result": "bp_700nx",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 9,
+    "skills_required": [ "gun", 7 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 7 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 20 ], [ "ammo_bullet", 18 ] ],
+    "components": [ [ [ "700nx_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 165 ] ], [ [ "copper", 10 ] ] ]
+  },
   {
     "result": "reloaded_762_51",
     "type": "recipe",
@@ -907,6 +987,23 @@
       [ [ "copper", 2 ] ]
     ]
   },
+  {
+    "result": "bp_762_54R",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "gun", 4 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 3 ] ],
+    "components": [ [ [ "762R_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 29 ] ], [ [ "copper", 2 ] ] ]
+  },
   {
     "result": "reloaded_762_m43",
     "type": "recipe",