summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-09-14 13:28:29 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-09-14 13:28:29 -0700
commit31914022abc4e0a38240d94c6724131d9a622055 (patch)
tree0f66602bd197bb67f19bbed40cfcb3a4a07fcaee
parentAdd deconstruction recipes for inactive dispatch drones (diff)
downloadcataclysm-dda-mod_recipe-fixes-31914022abc4e0a38240d94c6724131d9a622055.tar.xz
Clean up 40mm shot recipes.
-rw-r--r--json/recipes/ammo/40x46mm.json16
-rw-r--r--json/recipes/ammo/40x53mm.json8
2 files changed, 13 insertions, 11 deletions
diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json
index d689934..412b2e4 100644
--- a/json/recipes/ammo/40x46mm.json
+++ b/json/recipes/ammo/40x46mm.json
@@ -13,7 +13,7 @@
"charges": 1,
"reversible": true,
"using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
- "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+ "tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
@@ -37,7 +37,7 @@
"charges": 1,
"reversible": true,
"using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
- "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+ "tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
@@ -60,8 +60,8 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 12 ] ],
- "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
+ "tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
@@ -84,8 +84,8 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 12 ] ],
- "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
+ "tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
@@ -108,7 +108,8 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
+ "tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
@@ -132,6 +133,7 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
"tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json
index f1f54f8..ca013df 100644
--- a/json/recipes/ammo/40x53mm.json
+++ b/json/recipes/ammo/40x53mm.json
@@ -13,7 +13,7 @@
"charges": 1,
"reversible": true,
"using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 16 ] ],
- "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+ "tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
@@ -36,8 +36,8 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 16 ] ],
- "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 16 ] ],
+ "tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],
@@ -60,7 +60,7 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ],
+ "tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[ [ "sheet_metal_small", 1 ] ],