From 7f91b50a176e257d2f152ffbc3b87227b387d84c Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 11 Jul 2022 14:06:17 -0700
Subject: Switch to military_explosive group and require
 explosives_casting_standard for anything using it.

---
 json/recipes/weapons/explosive.json | 17 ++++++++++++-----
 json/uncraft/weapon/explosive.json  |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/json/recipes/weapons/explosive.json b/json/recipes/weapons/explosive.json
index 6b40d1d..56056bc 100644
--- a/json/recipes/weapons/explosive.json
+++ b/json/recipes/weapons/explosive.json
@@ -125,12 +125,15 @@
     "difficulty": 6,
     "time": "30 m",
     "book_learn": [ [ "textbook_anarch", 7 ] ],
-    "using": [ [ "soldering_standard", 6 ] ],
+    "using": [
+      [ "soldering_standard", 6 ],
+      [ "explosives_casting_standard", 1 ]
+    ],
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
       [ [ "sheet_metal_small", 3 ] ],
-      [ [ "chem_compositionb", 12 ] ],
+      [ [ "military_explosive", 2, "LIST" ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
@@ -186,11 +189,12 @@
     "difficulty": 8,
     "time": "30 m",
     "book_learn": [ [ "manual_traps_mil", 8 ] ],
+    "using": [ [ "explosives_casting_standard", 1 ] ],
     "qualities" : [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 3 } ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
-      [ [ "chem_compositionb", 150 ] ],
+      [ [ "military_explosive", 20, "LIST" ] ],
       [ [ "plastic_chunk", 1 ] ],
       [ [ "lamp_oil", 100 ], [ "motor_oil", 100 ] ]
     ]
@@ -207,12 +211,15 @@
     "time": "30 m",
     "reversible": false,
     "book_learn": [ [ "manual_traps_mil", 6 ] ],
-    "using": [ [ "soldering_standard", 6 ] ],
+    "using": [
+      [ "soldering_standard", 6 ],
+      [ "explosives_casting_standard", 1 ]
+    ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "impact_fuze", 1 ] ],
       [ [ "sheet_metal_small", 2 ] ],
-      [ [ "chem_compositionb", 75 ] ],
+      [ [ "military_explosive", 10, "LIST" ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   }
diff --git a/json/uncraft/weapon/explosive.json b/json/uncraft/weapon/explosive.json
index 6b3a307..ea84155 100644
--- a/json/uncraft/weapon/explosive.json
+++ b/json/uncraft/weapon/explosive.json
@@ -9,7 +9,7 @@
     "components": [
       [ [ "delay_fuze", 1 ] ],
       [ [ "sheet_metal_small", 3 ] ],
-      [ [ "chem_compositionb", 12 ] ],
+      [ [ "chem_compositionb", 16 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
@@ -142,7 +142,7 @@
     "components": [
       [ [ "impact_fuze", 1 ] ],
       [ [ "sheet_metal_small", 2 ] ],
-      [ [ "chem_compositionb", 75 ] ],
+      [ [ "chem_compositionb", 80 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   }
-- 
cgit v1.2.1