Replace the craftable 40mm grenades with handmade versions.

-Much as before, just 90% as powerful. This brings them in line with other reloaded ammo.
-This is save breaking.
Fix the description of 40mm flechettes to reference M1001 like how 40mm buckshot references M576.
-They still are not reloaded copies of M1001 or M576.
Fix all improvised 40mm rounds to be flagged as homemade and able to misfire, just like reloaded.
Reduce the uncraft time of improvised 40mm rounds to 3 minutes, just like factory 40mm rounds.

2 files changed, 242 insertions, 0 deletions

diff --git a/json/uncraft/ammo/40x46mm.json b/json/uncraft/ammo/40x46mm.json
index 66cc560..b6e48ae 100644
--- a/json/uncraft/ammo/40x46mm.json
+++ b/json/uncraft/ammo/40x46mm.json
@@ -17,6 +17,23 @@
     "charges": 1
   },
   {
+    "result": "40x46mm_bootleg_m433",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "chem_compositionb", 288 ] ],
+      [ [ "impact_fuze", 1 ] ],
+      [ [ "gunpowder", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  {
     "result": "40x46mm_m576",
     "type": "uncraft",
     "skill_used": "fabrication",
@@ -33,6 +50,22 @@
     "charges": 1
   },
   {
+    "result": "40x46mm_bootleg_m576",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "lead", 18 ] ],
+      [ [ "gunpowder", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  {
     "result": "40x46mm_m651",
     "type": "uncraft",
     "skill_used": "fabrication",
@@ -50,6 +83,23 @@
     "charges": 1
   },
   {
+    "result": "40x46mm_bootleg_m651",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "bleach", 2 ] ],
+      [ [ "ammonia", 2 ] ],
+      [ [ "impact_fuze", 1 ] ],
+      [ [ "gunpowder", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m195_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  {
     "result": "40x46mm_m1006",
     "type": "uncraft",
     "skill_used": "fabrication",
@@ -63,5 +113,116 @@
       [ [ "40x46mm_m212_casing", 1 ] ]
     ],
     "charges": 1
+  },
+  {
+    "result": "40x46mm_bootleg_m1006",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "rubber_slug", 2 ] ],
+      [ [ "gunpowder", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m212_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  { 
+    "result": "40x46mm_buckshot_m118",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "lead", 18 ] ],
+      [ [ "gunpowder", 30 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  { 
+    "result": "40x46mm_buckshot_m199",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "lead", 18 ] ],
+      [ [ "gunpowder", 30 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  { 
+    "result": "40x46mm_slug_m118",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "lead", 36 ] ],
+      [ [ "gunpowder", 30 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  { 
+    "result": "40x46mm_slug_m199",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "lead", 36 ] ],
+      [ [ "gunpowder", 30 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  { 
+    "result": "40x46mm_flechette_m118",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "combatnail", 40 ] ],
+      [ [ "gunpowder", 30 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  { 
+    "result": "40x46mm_flechette_m199",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "combatnail", 40 ] ],
+      [ [ "gunpowder", 30 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ]
+    ],
+    "charges": 1
   }
 ]
diff --git a/json/uncraft/ammo/40x53mm.json b/json/uncraft/ammo/40x53mm.json
index 35ddd49..c96ef39 100644
--- a/json/uncraft/ammo/40x53mm.json
+++ b/json/uncraft/ammo/40x53mm.json
@@ -17,6 +17,23 @@
     "charges": 1
   },
   {
+    "result": "40x53mm_bootleg_m430a1",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "impact_fuze", 1 ] ],
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "chem_compositionb", 288 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "40x53mm_m169_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  {
     "result": "40x53mm_m1001",
     "type": "uncraft",
     "skill_used": "fabrication",
@@ -31,5 +48,69 @@
       [ [ "40x53mm_m169_casing", 1 ] ]
     ],
     "charges": 1
+  },
+  {
+    "result": "40x53mm_bootleg_m1001",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "combatnail", 50 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "40x53mm_m169_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  {
+    "result": "40x53mm_buckshot_m169",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "lead", 22 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "40x53mm_m169_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  {
+    "result": "40x53mm_slug_m169",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "lead", 44 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "40x53mm_m169_casing", 1 ] ]
+    ],
+    "charges": 1
+  },
+  {
+    "result": "40x53mm_flechette_m169",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "paper", 1 ] ],
+      [ [ "combatnail", 50 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "40x53mm_m169_casing", 1 ] ]
+    ],
+    "charges": 1
   }
 ]