summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-03 20:43:13 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-03 20:43:13 -0700
commitf8e7e9eda6fde0fdfc1628bb04753f432ec79018 (patch)
tree7549961d7bc56793cf3211276c27431806be3f0d
parentUpdate modinfo (diff)
downloadcataclysm-dda-mod_grenade-crafting-f8e7e9eda6fde0fdfc1628bb04753f432ec79018.tar.xz
Update for removal of specialized gunpowder in BN
-rw-r--r--json/recipes/ammo/40x46mm.json8
-rw-r--r--json/recipes/ammo/40x53mm.json4
-rw-r--r--json/uncraft/ammo/40x46mm.json8
3 files changed, 10 insertions, 10 deletions
diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json
index 3f25ff8..9102707 100644
--- a/json/recipes/ammo/40x46mm.json
+++ b/json/recipes/ammo/40x46mm.json
@@ -17,7 +17,7 @@
[ [ "sheet_metal_small", 1 ] ],
[ [ "chem_compositionb", 32 ] ],
[ [ "impact_fuze", 1 ] ],
- [ [ "gunpowder_shotgun", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
[ [ "40x46mm_m118_casing", 1 ] ]
]
@@ -40,7 +40,7 @@
"components": [
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "combatnail", 35 ] ],
- [ [ "gunpowder_shotgun", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
[ [ "40x46mm_m199_casing", 1 ] ]
]
@@ -63,7 +63,7 @@
[ [ "bleach", 2 ] ],
[ [ "ammonia", 2 ] ],
[ [ "impact_fuze", 1 ] ],
- [ [ "gunpowder_shotgun", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
[ [ "40x46mm_m195_casing", 1 ] ]
]
@@ -86,7 +86,7 @@
"components": [
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "rubber_slug", 2 ] ],
- [ [ "gunpowder_shotgun", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
[ [ "40x46mm_m212_casing", 1 ] ]
]
diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json
index e19f620..6bb21a1 100644
--- a/json/recipes/ammo/40x53mm.json
+++ b/json/recipes/ammo/40x53mm.json
@@ -17,7 +17,7 @@
[ [ "impact_fuze", 1 ] ],
[ [ "sheet_metal_small", 1 ] ],
[ [ "chem_compositionb", 48 ] ],
- [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "40x53mm_m169_casing", 1 ] ]
]
@@ -40,7 +40,7 @@
"components": [
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "combatnail", 50 ] ],
- [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "40x53mm_m169_casing", 1 ] ]
]
diff --git a/json/uncraft/ammo/40x46mm.json b/json/uncraft/ammo/40x46mm.json
index 4502cbf..236783c 100644
--- a/json/uncraft/ammo/40x46mm.json
+++ b/json/uncraft/ammo/40x46mm.json
@@ -10,7 +10,7 @@
[ [ "sheet_metal_small", 1 ] ],
[ [ "chem_compositionb", 32 ] ],
[ [ "impact_fuze", 1 ] ],
- [ [ "gunpowder_shotgun", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
[ [ "40x46mm_m118_casing", 1 ] ]
],
@@ -26,7 +26,7 @@
"components": [
[ [ "paper", 1 ] ],
[ [ "combatnail", 35 ] ],
- [ [ "gunpowder_shotgun", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
[ [ "40x46mm_m199_casing", 1 ] ]
],
@@ -42,7 +42,7 @@
"components": [
[ [ "bleach", 2 ] ],
[ [ "ammonia", 2 ] ],
- [ [ "gunpowder_shotgun", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
[ [ "40x46mm_m195_casing", 1 ] ]
],
@@ -57,7 +57,7 @@
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ],
"components": [
[ [ "rubber_slug", 2 ] ],
- [ [ "gunpowder_shotgun", 35 ] ],
+ [ [ "gunpowder", 35 ] ],
[ [ "smpistol_primer", 1 ] ],
[ [ "40x46mm_m212_casing", 1 ] ]
],