Rebalance explosives using more realistic values.

4 files changed, 228 insertions, 72 deletions

diff --git a/json/items/tool/explosive.json b/json/items/tool/explosive.json
index 13cf58a..e74b7dc 100644
--- a/json/items/tool/explosive.json
+++ b/json/items/tool/explosive.json
@@ -7,6 +7,29 @@
     "name": { "str": "can bomb (active)", "str_pl": "can bombs (active)" }
   },
   {
+    "id": "c4",
+    "type": "TOOL",
+    "category": "weapons",
+    "name": { "str": "M112 explosive" },
+    "description": "This is block of US military M112 composition-4 explosive.  A label reads: \"Highly explosive, use with extreme caution!\" It comes with a small timer.",
+    "weight": "570 g",
+    "volume": "543 ml",
+    "price": 9000,
+    "price_postapoc": 2000,
+    "to_hit": -4,
+    "material": [ "plastic" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "use_action": "C4"
+  },
+  {
+    "id": "c4armed",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "c4armed",
+    "name": { "str": "M112 explosive (armed)", "str_pl": "M112 explosives (armed)" }
+  },
+  {
     "id": "EMPbomb_act",
     "type": "TOOL",
     "category": "weapons",
@@ -53,14 +76,14 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "grenade",
-    "name": { "str": "fragmentation grenade" }
+    "name": { "str": "M67 fragmentation grenade" }
   },
   {
     "id": "grenade_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "grenade_act",
-    "name": { "str": "fragmentation grenade (active)", "str_pl": "fragmentation grenades (active)" }
+    "name": { "str": "M67 fragmentation grenade (active)", "str_pl": "M67 fragmentation grenades (active)" }
   },
   {
     "id": "makeshift_grenade",
diff --git a/json/items/tool/traps.json b/json/items/tool/traps.json
new file mode 100644
index 0000000..ea2b4d1
--- /dev/null
+++ b/json/items/tool/traps.json
@@ -0,0 +1,28 @@
+[
+  { 
+    "id": "landmine",
+    "//": "Rebalanced under the assumption this is intended to be the US M14 mine due to the lack of blast radius and reduced lethality compared to a grenade.",
+    "type": "GENERIC",
+    "category": "tools",
+    "name": { "str": "M14 land mine" },
+    "description": "This is a US military M14 anti-personnel mine that is triggered when stepped upon.",
+    "weight": "108 g",
+    "volume": "704 ml",
+    "price": 5000,
+    "price_postapoc": 500,
+    "to_hit": -1,
+    "bashing": 6,
+    "material": "plastic",
+    "symbol": ";",
+    "color": "dark_gray",
+    "use_action": {
+      "type": "place_trap",
+      "bury_question": "Bury the land mine?",
+      "bury": { "trap": "tr_landmine_buried", "moves": 275, "practice": 7, "done_message": "You bury the land mine." },
+      "trap": "tr_landmine",
+      "moves": 200,
+      "practice": 4,
+      "done_message": "You set the land mine."
+    }
+  }
+]
diff --git a/json/recipes/weapons/explosive.json b/json/recipes/weapons/explosive.json
index 56056bc..4fec666 100644
--- a/json/recipes/weapons/explosive.json
+++ b/json/recipes/weapons/explosive.json
@@ -1,5 +1,41 @@
 [
   {
+    "result": "c4",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_EXPLOSIVE",
+    "skill_used": "cooking",
+    "skills_required": [ "mechanics", 6 ],
+    "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 ] ],
+      [ [ "military_explosive", 63, "LIST" ] ],
+      [ [ "plastic_chunk", 1 ] ],
+      [ [ "lamp_oil", 100 ], [ "motor_oil", 100 ] ]
+    ]
+  },
+  {
+    "result": "can_bomb",
+    "//": "Poor man's grenade.",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_EXPLOSIVE",
+    "skill_used": "fabrication",
+    "time": "2 m",
+    "reversible": true,
+    "autolearn": true,
+    "components": [
+      [ [ "volatile_explosive", 18, "LIST" ], [ "stable_explosive", 18, "LIST" ], [ "military_explosive", 18, "LIST" ] ],
+      [ [ "canister_empty", 1 ], [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "fuse", 1 ] ]
+    ]
+  },
+  {
     "result": "flashbang",
     "type": "recipe",
     "category": "CC_WEAPON",
@@ -19,7 +55,7 @@
     ]
   },
   {
-    "result": "gasbomb",
+    "result": "fungicidalbomb",
     "type": "recipe",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_EXPLOSIVE",
@@ -27,18 +63,19 @@
     "skills_required": [ "mechanics", 6 ],
     "difficulty": 6,
     "time": "30 m",
-    "book_learn": [ [ "textbook_anarch", 7 ] ],
+    "book_learn": [ [ "textbook_anarch", 3 ] ],
     "using": [ [ "soldering_standard", 6 ] ],
-    "qualities" : [ { "id": "CHEM", "level": 2 }, { "id": "SCREW", "level": 1 } ],
+    "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
       [ [ "bleach", 2 ] ],
-      [ [ "ammonia", 2 ] ],
+      [ [ "fungicide", 50 ] ],
+      [ [ "chem_sulphur", 150 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
   {
-    "result": "fungicidalbomb",
+    "result": "gasbomb",
     "type": "recipe",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_EXPLOSIVE",
@@ -46,44 +83,45 @@
     "skills_required": [ "mechanics", 6 ],
     "difficulty": 6,
     "time": "30 m",
-    "book_learn": [ [ "textbook_anarch", 3 ] ],
+    "book_learn": [ [ "textbook_anarch", 7 ] ],
     "using": [ [ "soldering_standard", 6 ] ],
-    "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "SCREW", "level": 1 } ],
+    "qualities" : [ { "id": "CHEM", "level": 2 }, { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
       [ [ "bleach", 2 ] ],
-      [ [ "fungicide", 50 ] ],
-      [ [ "chem_sulphur", 150 ] ],
+      [ [ "ammonia", 2 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
   {
-    "result": "insecticidalbomb",
+    "result": "grenade",
+    "//": "Assumed to be the M67 with 180g of comp b.",
     "type": "recipe",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_EXPLOSIVE",
-    "skill_used": "cooking",
+    "skill_used": "fabrication",
     "skills_required": [ "mechanics", 6 ],
     "difficulty": 6,
     "time": "30 m",
-    "book_learn": [ [ "textbook_anarch", 3 ] ],
-    "using": [ [ "soldering_standard", 6 ] ],
-    "qualities": [ { "id": "CHEM", "level": 2 } , { "id": "SCREW", "level": 1 }],
+    "book_learn": [ [ "textbook_anarch", 7 ] ],
+    "using": [
+      [ "soldering_standard", 6 ],
+      [ "explosives_casting_standard", 1 ]
+    ],
+    "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
-      [ [ "bleach", 2 ] ],
-      [ [ "insecticide", 50 ] ],
-      [ [ "water", 2 ], [ "water_clean", 2 ] ],
+      [ [ "sheet_metal_small", 3 ] ],
+      [ [ "military_explosive", 23, "LIST" ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
   {
-    "result": "grenade_inc",
+    "result": "grenade_emp",
     "type": "recipe",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_EXPLOSIVE",
-    "skill_used": "cooking",
-    "skills_required": [ "mechanics", 6 ],
+    "skill_used": "electronics",
     "difficulty": 6,
     "time": "30 m",
     "book_learn": [ [ "textbook_anarch", 7 ] ],
@@ -91,16 +129,20 @@
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
-      [ [ "incendiary", 150 ] ],
+      [ [ "power_supply", 1 ] ],
+      [ [ "amplifier", 1 ] ],
+      [ [ "cable", 5 ] ],
+      [ [ "antenna", 1 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
   {
-    "result": "grenade_emp",
+    "result": "grenade_inc",
     "type": "recipe",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_EXPLOSIVE",
-    "skill_used": "electronics",
+    "skill_used": "cooking",
+    "skills_required": [ "mechanics", 6 ],
     "difficulty": 6,
     "time": "30 m",
     "book_learn": [ [ "textbook_anarch", 7 ] ],
@@ -108,33 +150,105 @@
     "qualities" : [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
-      [ [ "power_supply", 1 ] ],
-      [ [ "amplifier", 1 ] ],
-      [ [ "cable", 5 ] ],
-      [ [ "antenna", 1 ] ],
+      [ [ "incendiary", 150 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
   {
-    "result": "grenade",
+    "result": "improvised_demolition_charge",
+    "//": "A homemade explosive similar to C4. Uses 50% more explosive components.",
     "type": "recipe",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_EXPLOSIVE",
     "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "5 m",
+    "autolearn": true,
+    "components": [
+      [ [ "volatile_explosive", 94, "LIST" ], [ "stable_explosive", 94, "LIST" ], [ "military_explosive", 94, "LIST" ] ],
+      [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ],
+      [ [ "jug_plastic", 1 ] ]
+    ]
+  },
+  {
+    "result": "improvised_grenade",
+    "//": "A homemade explosive similar to a grenade. Uses 50% more explosive components.",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_EXPLOSIVE",
+    "skill_used": "fabrication",
+    "skills_required": [ "mechanics", 1 ],
+    "difficulty": 2,
+    "time": "5 m",
+    "reversible": true,
+    "autolearn": true,
+    "components": [
+      [ [ "volatile_explosive", 35, "LIST" ], [ "stable_explosive", 35, "LIST" ], [ "military_explosive", 35, "LIST" ] ],
+      [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ],
+      [ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ],
+      [ [ "canister_empty", 1 ], [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "nail", 30 ], [ "scrap", 2 ] ]
+    ]
+  },
+  {
+    "result": "improvised_pipebomb",
+    "//": "A homemade explosive with half the blast of a grenade, but with more shrapnel.",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_EXPLOSIVE",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "time": "15 m",
+    "reversible": true,
+    "autolearn": true,
+    "qualities": [ { "id": "SAW_M", "level": 1 } ],
+    "components": [
+      [ [ "volatile_explosive", 35, "LIST" ], [ "stable_explosive", 35, "LIST" ], [ "military_explosive", 35, "LIST" ] ],
+      [ [ "pipe", 1 ] ],
+      [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ]
+    ]
+  },
+  {
+    "result": "insecticidalbomb",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_EXPLOSIVE",
+    "skill_used": "cooking",
     "skills_required": [ "mechanics", 6 ],
     "difficulty": 6,
     "time": "30 m",
-    "book_learn": [ [ "textbook_anarch", 7 ] ],
+    "book_learn": [ [ "textbook_anarch", 3 ] ],
+    "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 ] ],
+      [ [ "canister_empty", 1 ] ]
+    ]
+  },
+  {
+    "result": "landmine",
+    "//": "Since there is no blast redius and low damage, assumed to be the US M14 mine.",
+    "type": "recipe",
+    "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 ],
       [ "explosives_casting_standard", 1 ]
     ],
-    "qualities" : [ { "id": "SCREW", "level": 1 } ],
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
-      [ [ "delay_fuze", 1 ] ],
-      [ [ "sheet_metal_small", 3 ] ],
-      [ [ "military_explosive", 2, "LIST" ] ],
-      [ [ "canister_empty", 1 ] ]
+      [ [ "impact_fuze", 1 ] ],
+      [ [ "plastic_chunk", 2 ] ],
+      [ [ "military_explosive", 3, "LIST" ] ]
     ]
   },
   {
@@ -180,47 +294,39 @@
     ]
   },
   {
-    "result": "c4",
+    "result": "tool_improvised_barrel_bomb",
+    "//": "A homemade explosive comparable to a mininuke. Uses x5 materials compared to C4 due to the large blast radius.",
     "type": "recipe",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_EXPLOSIVE",
-    "skill_used": "cooking",
-    "skills_required": [ "mechanics", 6 ],
-    "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 ] ] ],
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "2 h",
+    "reversible": true,
+    "book_learn": [ [ "manual_launcher", 7 ], [ "textbook_anarch", 8 ] ],
     "components": [
-      [ [ "delay_fuze", 1 ] ],
-      [ [ "military_explosive", 20, "LIST" ] ],
-      [ [ "plastic_chunk", 1 ] ],
-      [ [ "lamp_oil", 100 ], [ "motor_oil", 100 ] ]
+      [ [ "volatile_explosive", 500, "LIST" ], [ "stable_explosive", 500, "LIST" ], [ "military_explosive", 500, "LIST" ] ],
+      [ [ "30gal_drum", 1 ] ],
+      [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ]
     ]
   },
   {
-    "result": "landmine",
-    "//": "Roughly a double-size freagmentation grenade with an impact timer.",
+    "result": "tool_small_improvised_fragmentation_device",
+    "//": "A homemade explosive similar to C4, but with less blast and more shrapnel. Uses 50% more explosive components.",
     "type": "recipe",
-    "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 ],
-      [ "explosives_casting_standard", 1 ]
-    ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_EXPLOSIVE",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "5 m",
+    "reversible": true,
+    "book_learn": [ [ "manual_launcher", 4 ], [ "textbook_anarch", 5 ] ],
+    "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "components": [
-      [ [ "impact_fuze", 1 ] ],
-      [ [ "sheet_metal_small", 2 ] ],
-      [ [ "military_explosive", 10, "LIST" ] ],
-      [ [ "canister_empty", 1 ] ]
+      [ [ "volatile_explosive", 94, "LIST" ], [ "stable_explosive", 94, "LIST" ], [ "military_explosive", 94, "LIST" ] ],
+      [ [ "jug_plastic", 1 ] ],
+      [ [ "scrap", 20 ] ],
+      [ [ "delay_fuze", 1 ], [ "fuse", 1 ] ]
     ]
   }
 ]
diff --git a/json/uncraft/weapon/explosive.json b/json/uncraft/weapon/explosive.json
index ea84155..426106f 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", 16 ] ],
+      [ [ "chem_compositionb", 184 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
@@ -141,9 +141,8 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "impact_fuze", 1 ] ],
-      [ [ "sheet_metal_small", 2 ] ],
-      [ [ "chem_compositionb", 80 ] ],
-      [ [ "canister_empty", 1 ] ]
+      [ [ "plastic_chunk", 2 ] ],
+      [ [ "chem_compositionb", 3 ] ]
     ]
   }
 ]