Clean up the landmine and smoke grenade recipes to be more military.

Clean up the frag/incendiary grenade uncrafts.
Clean up the landmine uncraft.

2 files changed, 86 insertions, 13 deletions

diff --git a/json/recipes/weapons/explosive.json b/json/recipes/weapons/explosive.json
index 4c9a47e..ae17274 100644
--- a/json/recipes/weapons/explosive.json
+++ b/json/recipes/weapons/explosive.json
@@ -12,7 +12,7 @@
     "using": [ [ "soldering_standard", 6 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
-      [ [ "pilot_light", 1 ] ],
+      [ [ "delay_fuze", 1 ] ],
       [ [ "oxy_powder", 75 ] ],
       [ [ "incendiary", 50 ] ],
       [ [ "canister_empty", 1 ] ]
@@ -31,6 +31,7 @@
     "using": [ [ "soldering_standard", 6 ] ],
     "qualities" : [ { "id": "CHEM", "level": 2 }, { "id": "SCREW", "level": 1 } ],
     "components": [
+      [ [ "delay_fuze", 1 ] ],
       [ [ "bleach", 2 ] ],
       [ [ "ammonia", 2 ] ],
       [ [ "canister_empty", 1 ] ]
@@ -49,6 +50,7 @@
     "using": [ [ "soldering_standard", 6 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "SCREW", "level": 1 } ],
     "components": [
+      [ [ "delay_fuze", 1 ] ],
       [ [ "bleach", 2 ] ],
       [ [ "fungicide", 50 ] ],
       [ [ "chem_sulphur", 150 ] ],
@@ -68,6 +70,7 @@
     "using": [ [ "soldering_standard", 6 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 } , { "id": "SCREW", "level": 1 }],
     "components": [
+      [ [ "delay_fuze", 1 ] ],
       [ [ "bleach", 2 ] ],
       [ [ "insecticide", 50 ] ],
       [ [ "water", 2 ], [ "water_clean", 2 ] ],
@@ -87,7 +90,7 @@
     "using": [ [ "soldering_standard", 6 ] ],
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
-      [ [ "pilot_light", 1 ] ],
+      [ [ "delay_fuze", 1 ] ],
       [ [ "incendiary", 150 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
@@ -104,6 +107,7 @@
     "using": [ [ "soldering_standard", 6 ] ],
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
+      [ [ "delay_fuze", 1 ] ],
       [ [ "power_supply", 1 ] ],
       [ [ "amplifier", 1 ] ],
       [ [ "cable", 5 ] ],
@@ -124,9 +128,9 @@
     "using": [ [ "soldering_standard", 6 ] ],
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
-      [ [ "pilot_light", 1 ] ],
+      [ [ "delay_fuze", 1 ] ],
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "chem_compositionb", 200 ] ],
+      [ [ "chem_compositionb", 32 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
@@ -143,6 +147,7 @@
     "using": [ [ "soldering_standard", 6 ] ],
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
+      [ [ "delay_fuze", 1 ] ],
       [ [ "grenade_emp", 1 ] ],
       [ [ "antenna", 1 ] ],
       [ [ "transponder", 1 ] ],
@@ -157,14 +162,18 @@
     "skill_used": "cooking",
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 3,
-    "time": "7 m 30 s",
-    "autolearn": true,
+    "time": "30 m",
+    "book_learn": [ [ "textbook_anarch", 3 ] ],
+    "autolearn": false,
+    "using": [ [ "soldering_standard", 6 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
-      [ [ "water", 1 ], [ "water_clean", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ],
-      [ [ "candy", 1 ], [ "cola", 1 ] ],
-      [ [ "vitamins", 10 ], [ "aspirin", 8 ] ],
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_drink_unsealed", 1 ] ],
+      [ [ "delay_fuze", 1 ] ],
+      [ [ "chem_muriatic_acid", 1 ] ],
+      [ [ "scrap", 1 ] ],
+      [ [ "aluminium_powder", 25 ] ],
+      [ [ "zinc_powder", 25 ] ],
+      [ [ "canister_empty", 1 ] ],
       [ [ "superglue", 1 ] ]
     ]
   },
@@ -177,14 +186,35 @@
     "skills_required": [ "mechanics", 6 ],
     "difficulty": 8,
     "time": "30 m",
-    "book_learn": [ [ "textbook_anarch", 8 ] ],
+    "book_learn": [ [ "manual_traps_mil", 8 ] ],
     "qualities" : [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 3 } ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
     "components": [
-      [ [ "pilot_light", 1 ] ],
-      [ [ "chem_compositionb", 1500 ] ],
+      [ [ "delay_fuze", 1 ] ],
+      [ [ "chem_compositionb", 150 ] ],
       [ [ "plastic_chunk", 1 ] ],
       [ [ "lamp_oil", 100 ], [ "motor_oil", 100 ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "note": "Roughly a double-size freagmentation grenade with an impact timer.",
+    "result": "landmine",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TRAPS",
+    "skill_used": "traps",
+    "skills_required": [ "mechanics", 6 ],
+    "difficulty": 5,
+    "time": "30 m",
+    "reversible": false,
+    "book_learn": [ [ "manual_traps_mil", 6 ] ],
+    "using": [ [ "soldering_standard", 6 ] ],
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "components": [
+      [ [ "impact_fuze", 1 ] ],
+      [ [ "sheet_metal_small", 2 ] ],
+      [ [ "chem_compositionb", 75 ] ],
+      [ [ "canister_empty", 1 ] ]
+    ]
   }
 ]
diff --git a/json/uncraft/weapon/explosive.json b/json/uncraft/weapon/explosive.json
new file mode 100644
index 0000000..b9f719b
--- /dev/null
+++ b/json/uncraft/weapon/explosive.json
@@ -0,0 +1,43 @@
+[
+  {
+    "type": "uncraft",
+    "result": "grenade",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "1 m 30 s",
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "components": [
+      [ [ "delay_fuze", 1 ] ],
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "chem_compositionb", 32 ] ],
+      [ [ "canister_empty", 1 ] ]
+    ]
+  },
+  {
+    "type": "uncraft",
+    "result": "grenade_inc",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "1 m 30 s",
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "components": [
+      [ [ "delay_fuze", 1 ] ],
+      [ [ "incendiary", 150 ] ],
+      [ [ "canister_empty", 1 ] ]
+    ]
+  },
+  {
+    "type": "uncraft",
+    "result": "landmine",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 m",
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "components": [
+      [ [ "impact_fuze", 1 ] ],
+      [ [ "sheet_metal_small", 2 ] ],
+      [ [ "chem_compositionb", 75 ] ],
+      [ [ "canister_empty", 1 ] ]
+    ]
+  }
+]