summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-07-11 18:11:38 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-07-11 18:11:38 -0700
commit3e33ed305a5a258eae8edfb9d1ba970e71c2b494 (patch)
tree4bcce14e5379f13f29815665726449729ad067ed
parentRebalance explosives using more realistic values. (diff)
downloadcataclysm-dda-mod_grenade-crafting-3e33ed305a5a258eae8edfb9d1ba970e71c2b494.tar.xz
Update 40mm comp-b usage.
Also fix text for M67 grenades.
-rw-r--r--json/items/tool/explosive.json3
-rw-r--r--json/recipes/ammo/40x46mm.json2
-rw-r--r--json/recipes/ammo/40x53mm.json2
-rw-r--r--json/uncraft/ammo/40x46mm.json2
-rw-r--r--json/uncraft/ammo/40x53mm.json2
5 files changed, 6 insertions, 5 deletions
diff --git a/json/items/tool/explosive.json b/json/items/tool/explosive.json
index e74b7dc..0f4cb8b 100644
--- a/json/items/tool/explosive.json
+++ b/json/items/tool/explosive.json
@@ -76,7 +76,8 @@
"type": "TOOL",
"category": "weapons",
"copy-from": "grenade",
- "name": { "str": "M67 fragmentation grenade" }
+ "name": { "str": "M67 fragmentation grenade" },
+ "description": "This is a US military M67 fragmentation grenade. Use this item to pull the pin and light the fuse. You will then have five seconds before it explodes; throwing it would be a good idea."
},
{
"id": "grenade_act",
diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json
index 29b6414..e6563e7 100644
--- a/json/recipes/ammo/40x46mm.json
+++ b/json/recipes/ammo/40x46mm.json
@@ -15,7 +15,7 @@
"qualities" : [ { "id": "SCREW", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
- [ [ "chem_compositionb", 32 ] ],
+ [ [ "military_explosive", 23, "LIST" ] ],
[ [ "impact_fuze", 1 ] ],
[ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json
index 6bb21a1..235626d 100644
--- a/json/recipes/ammo/40x53mm.json
+++ b/json/recipes/ammo/40x53mm.json
@@ -16,7 +16,7 @@
"components": [
[ [ "impact_fuze", 1 ] ],
[ [ "sheet_metal_small", 1 ] ],
- [ [ "chem_compositionb", 48 ] ],
+ [ [ "military_explosive", 36, "LIST" ] ],
[ [ "gunpowder", 35 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "40x53mm_m169_casing", 1 ] ]
diff --git a/json/uncraft/ammo/40x46mm.json b/json/uncraft/ammo/40x46mm.json
index b040693..a48dd27 100644
--- a/json/uncraft/ammo/40x46mm.json
+++ b/json/uncraft/ammo/40x46mm.json
@@ -8,7 +8,7 @@
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
- [ [ "chem_compositionb", 32 ] ],
+ [ [ "chem_compositionb", 288 ] ],
[ [ "impact_fuze", 1 ] ],
[ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
diff --git a/json/uncraft/ammo/40x53mm.json b/json/uncraft/ammo/40x53mm.json
index e7efd8e..129e865 100644
--- a/json/uncraft/ammo/40x53mm.json
+++ b/json/uncraft/ammo/40x53mm.json
@@ -9,7 +9,7 @@
"components": [
[ [ "impact_fuze", 1 ] ],
[ [ "sheet_metal_small", 1 ] ],
- [ [ "chem_compositionb", 48 ] ],
+ [ [ "chem_compositionb", 288 ] ],
[ [ "gunpowder_shotgun", 35 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "40x53mm_m169_casing", 1 ] ]