Port to DDA.

1 files changed, 233 insertions, 45 deletions

diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json
index fa00a20..36d27e5 100644
--- a/json/recipes/ammo/40x46mm.json
+++ b/json/recipes/ammo/40x46mm.json
@@ -2,6 +2,7 @@
   {
     "result": "40x46mm_bootleg_m433",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -11,13 +12,14 @@
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "textbook_anarch", 7 ] ],
     "charges": 1,
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
       [ [ "military_explosive", 23, "LIST" ] ],
       [ [ "impact_fuze", 1 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ]
     ]
@@ -25,6 +27,7 @@
   {
     "result": "40x46mm_bootleg_m576",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -34,12 +37,13 @@
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "textbook_anarch", 7 ] ],
     "charges": 1,
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ],
     "tools": [ [ [ "swage", -1 ] ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "paper", 1 ], [ "wax", 1 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 3 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ]
     ]
@@ -47,6 +51,7 @@
   {
     "result": "40x46mm_bootleg_m651",
     "type" : "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "cooking",
@@ -56,13 +61,14 @@
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "textbook_anarch", 7 ] ],
     "charges": 1,
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
     "qualities" : [ { "id": "SCREW", "level": 1 }, { "id": "CHEM", "level": 2 } ],
     "components": [
       [ [ "bleach", 2 ] ],
       [ [ "ammonia", 2 ] ],
       [ [ "impact_fuze", 1 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m195_casing", 1 ] ]
     ]
@@ -70,6 +76,7 @@
   {
     "result": "40x46mm_bootleg_m1006",
     "type" : "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -79,20 +86,22 @@
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "textbook_anarch", 7 ] ],
     "charges": 1,
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "shot_forming", 2 ] ],
     "tools": [ [ [ "swage", -1 ] ] ],
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "paper", 1 ], [ "wax", 1 ] ],
       [ [ "rubber_slug", 2 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m212_casing", 1 ] ]
     ]
   },
-  { 
+  {
     "result": "40x46mm_buckshot_m118",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -103,19 +112,23 @@
     "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
     "charges": 1,
     "reversible": true,
-    "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ],
-    "tools": [ [ [ "swage", -1 ] ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
+    "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
+      [ [ "sheet_metal_small", 1 ] ],
       [ [ "paper", 1 ], [ "wax", 1 ] ],
-      [ [ "gunpowder", 30 ] ],
-      [ [ "smpistol_primer", 1 ] ],
-      [ [ "40x46mm_m118_casing", 1 ] ]
+      [ [ "gunpowder_shotgun", 2 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ]
     ]
   },
-  { 
+  {
     "result": "40x46mm_buckshot_m199",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -126,19 +139,23 @@
     "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
     "charges": 1,
     "reversible": true,
-    "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ],
-    "tools": [ [ [ "swage", -1 ] ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
     "components": [
+      [ [ "sheet_metal_small", 1 ] ],
       [ [ "paper", 1 ], [ "wax", 1 ] ],
-      [ [ "gunpowder", 30 ] ],
-      [ [ "smpistol_primer", 1 ] ],
-      [ [ "40x46mm_m199_casing", 1 ] ]
+      [ [ "gunpowder_shotgun", 2 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ],
+      [ [ "lgpistol_primer", 1 ] ]
     ]
   },
-  { 
+  {
     "result": "40x46mm_slug_m118",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -149,19 +166,23 @@
     "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
     "charges": 1,
     "reversible": true,
-    "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 36 ] ],
-    "tools": [ [ [ "swage", -1 ] ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
     "components": [
+      [ [ "sheet_metal_small", 1 ] ],
       [ [ "paper", 1 ], [ "wax", 1 ] ],
-      [ [ "gunpowder", 30 ] ],
-      [ [ "smpistol_primer", 1 ] ],
-      [ [ "40x46mm_m118_casing", 1 ] ]
+      [ [ "gunpowder_shotgun", 2 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ]
     ]
   },
-  { 
+  {
     "result": "40x46mm_slug_m199",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -172,19 +193,23 @@
     "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
     "charges": 1,
     "reversible": true,
-    "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 36 ] ],
-    "tools": [ [ [ "swage", -1 ] ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
     "components": [
+      [ [ "sheet_metal_small", 1 ] ],
       [ [ "paper", 1 ], [ "wax", 1 ] ],
-      [ [ "gunpowder", 30 ] ],
-      [ [ "smpistol_primer", 1 ] ],
-      [ [ "40x46mm_m199_casing", 1 ] ]
+      [ [ "gunpowder_shotgun", 2 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ],
+      [ [ "lgpistol_primer", 1 ] ]
     ]
   },
   {
     "result": "40x46mm_flechette_m118",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -195,19 +220,23 @@
     "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
     "charges": 1,
     "reversible": true,
-    "tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ], [ [ "swage", -1 ] ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
+      [ [ "sheet_metal_small", 1 ] ],
       [ [ "paper", 1 ], [ "wax", 1 ] ],
-      [ [ "combatnail", 40 ] ],
-      [ [ "gunpowder", 30 ] ],
-      [ [ "smpistol_primer", 1 ] ],
-      [ [ "40x46mm_m118_casing", 1 ] ]
+      [ [ "combatnail", 10 ] ],
+      [ [ "gunpowder_shotgun", 2 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ]
     ]
   },
-  { 
+  {
     "result": "40x46mm_flechette_m199",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_GRENADES",
     "skill_used": "fabrication",
@@ -218,14 +247,173 @@
     "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
     "charges": 1,
     "reversible": true,
-    "tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ], [ [ "swage", -1 ] ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
+      [ [ "sheet_metal_small", 1 ] ],
       [ [ "paper", 1 ], [ "wax", 1 ] ],
-      [ [ "combatnail", 40 ] ],
-      [ [ "gunpowder", 30 ] ],
-      [ [ "smpistol_primer", 1 ] ],
-      [ [ "40x46mm_m199_casing", 1 ] ]
+      [ [ "combatnail", 10 ] ],
+      [ [ "gunpowder_shotgun", 2 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ],
+      [ [ "lgpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "result": "bp_40x46mm_buckshot_m118",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_GRENADES",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "launcher", 2 ],
+    "time": "10 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "chem_black_powder", 2 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "result": "bp_40x46mm_buckshot_m199",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_GRENADES",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "launcher", 2 ],
+    "time": "10 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "chem_black_powder", 2 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ],
+      [ [ "lgpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "result": "bp_40x46mm_slug_m118",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_GRENADES",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "launcher", 2 ],
+    "time": "10 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "chem_black_powder", 2 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "result": "bp_40x46mm_slug_m199",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_GRENADES",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "launcher", 2 ],
+    "time": "10 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "chem_black_powder", 2 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ],
+      [ [ "lgpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "result": "bp_40x46mm_flechette_m118",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_GRENADES",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "launcher", 2 ],
+    "time": "10 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "components": [
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "combatnail", 10 ] ],
+      [ [ "chem_black_powder", 2 ] ],
+      [ [ "40x46mm_m118_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ]
+    ]
+  },
+  {
+    "result": "bp_40x46mm_flechette_m199",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_GRENADES",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "launcher", 2 ],
+    "time": "10 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "components": [
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "combatnail", 10 ] ],
+      [ [ "chem_black_powder", 2 ] ],
+      [ [ "40x46mm_m199_casing", 1 ] ],
+      [ [ "lgpistol_primer", 1 ] ]
     ]
   }
 ]