Add the M1006 recipe.

Fix the backwards M433 and M576 uncrafts.
Clean up the 40x46mm grenade uncrafts.
Clean up the 40x46mm grenade recipes based on the uncrafts.

2 files changed, 99 insertions, 10 deletions

diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json
index e2650e3..b9f860d 100644
--- a/json/recipes/ammo/40x46mm.json
+++ b/json/recipes/ammo/40x46mm.json
@@ -14,11 +14,12 @@
     "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
-      [ [ "pilot_light", 1 ] ],
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "chem_compositionb", 200 ] ],
-      [ [ "40x46mm_m118_casing", 1 ] ],
-      [ [ "smpistol_primer", 1 ] ]
+      [ [ "chem_compositionb", 32 ] ],
+      [ [ "impact_fuze", 1 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ]
     ]
   },
   {
@@ -38,10 +39,10 @@
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "paper", 1 ], [ "wax", 1 ] ],
-      [ [ "sheet_metal_small", 1 ] ],
-      [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ],
-      [ [ "40x46mm_m199_casing", 1 ] ],
-      [ [ "smpistol_primer", 1 ] ]
+      [ [ "combatnail", 35 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ]
     ]
   },
   {
@@ -61,8 +62,30 @@
     "components": [
       [ [ "bleach", 2 ] ],
       [ [ "ammonia", 2 ] ],
-      [ [ "40x46mm_m195_casing", 1 ] ],
-      [ [ "smpistol_primer", 1 ] ]
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m195_casing", 1 ] ]
+    ]
+  },
+  {
+    "result": "40x46mm_m1006",
+    "type" : "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_GRENADES",
+    "skill_used": "cooking",
+    "difficulty": 6,
+    "skills_required": [ "launcher", 3 ],
+    "time": "30 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "textbook_anarch", 7 ] ],
+    "charges": 1,
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities" : [ { "id": "SCREW", "level": 1 } ],
+    "components": [
+      [ [ "rubber_slug", 2 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m212_casing", 1 ] ]
     ]
   }
 ]
diff --git a/json/uncraft/ammo/40x46mm.json b/json/uncraft/ammo/40x46mm.json
new file mode 100644
index 0000000..4502cbf
--- /dev/null
+++ b/json/uncraft/ammo/40x46mm.json
@@ -0,0 +1,66 @@
+[
+  {
+    "result": "40x46mm_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", 32 ] ],
+      [ [ "impact_fuze", 1 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ]
+    ],
+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+  },
+  {
+    "result": "40x46mm_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 ] ],
+      [ [ "combatnail", 35 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ]
+    ],
+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+  },
+  {
+    "result": "40x46mm_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 ] ],
+      [ [ "gunpowder_shotgun", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m195_casing", 1 ] ]
+    ],
+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+  },
+  {
+    "result": "40x46mm_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_shotgun", 35 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "40x46mm_m212_casing", 1 ] ]
+    ],
+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+  }
+]