Port to DDA.

1 files changed, 16 insertions, 104 deletions

diff --git a/json/uncraft/ammo/40x46mm.json b/json/uncraft/ammo/40x46mm.json
index b6e48ae..63db506 100644
--- a/json/uncraft/ammo/40x46mm.json
+++ b/json/uncraft/ammo/40x46mm.json
@@ -2,6 +2,7 @@
   {
     "result": "40x46mm_m433",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "fabrication",
     "difficulty": 4,
     "time": "3 m",
@@ -10,7 +11,7 @@
       [ [ "sheet_metal_small", 1 ] ],
       [ [ "chem_compositionb", 288 ] ],
       [ [ "impact_fuze", 1 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ]
     ],
@@ -19,6 +20,7 @@
   {
     "result": "40x46mm_bootleg_m433",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "fabrication",
     "difficulty": 4,
     "time": "3 m",
@@ -27,7 +29,7 @@
       [ [ "sheet_metal_small", 1 ] ],
       [ [ "chem_compositionb", 288 ] ],
       [ [ "impact_fuze", 1 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ]
     ],
@@ -36,6 +38,7 @@
   {
     "result": "40x46mm_m576",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "fabrication",
     "difficulty": 4,
     "time": "3 m",
@@ -43,7 +46,7 @@
     "components": [
       [ [ "paper", 1 ] ],
       [ [ "lead", 18 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 3 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ]
     ],
@@ -52,6 +55,7 @@
   {
     "result": "40x46mm_bootleg_m576",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "fabrication",
     "difficulty": 4,
     "time": "3 m",
@@ -59,7 +63,7 @@
     "components": [
       [ [ "paper", 1 ] ],
       [ [ "lead", 18 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 3 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ]
     ],
@@ -68,6 +72,7 @@
   {
     "result": "40x46mm_m651",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "fabrication",
     "difficulty": 4,
     "time": "3 m",
@@ -76,7 +81,7 @@
       [ [ "bleach", 2 ] ],
       [ [ "ammonia", 2 ] ],
       [ [ "impact_fuze", 1 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m195_casing", 1 ] ]
     ],
@@ -85,6 +90,7 @@
   {
     "result": "40x46mm_bootleg_m651",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "fabrication",
     "difficulty": 4,
     "time": "3 m",
@@ -93,7 +99,7 @@
       [ [ "bleach", 2 ] ],
       [ [ "ammonia", 2 ] ],
       [ [ "impact_fuze", 1 ] ],
-      [ [ "gunpowder", 35 ] ],
+      [ [ "gunpowder_shotgun", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m195_casing", 1 ] ]
     ],
@@ -102,13 +108,14 @@
   {
     "result": "40x46mm_m1006",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "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 ] ],
+      [ [ "gunpowder_shotgun", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
       [ [ "40x46mm_m212_casing", 1 ] ]
     ],
@@ -117,112 +124,17 @@
   {
     "result": "40x46mm_bootleg_m1006",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "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 ] ],
+      [ [ "gunpowder_shotgun", 1 ] ],
       [ [ "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
   }
 ]