summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-09-13 20:08:50 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-09-13 20:08:50 -0700
commitc12a90c7a9be5feeca065e2bb8a5ea2af35359f2 (patch)
treea0c43fefb3037a0c32a14709380cf17732ced3f0
parentStandardize on small pistol primer for 40x46mm and large rifle primer for 40x... (diff)
downloadcataclysm-dda-mod_grenade-crafting-c12a90c7a9be5feeca065e2bb8a5ea2af35359f2.tar.xz
Increase lead usage in 40mm shotgun rounds to compensate for their high damage.
No more sheet metal for crafting 40mm shotgun rounds. -Sheet metal is for shrapnel, not buckshot. No longer require lead for crafting 40mm flechette rounds. -Lead is for buckshot and slugs, not flechettes.
-rw-r--r--json/recipes/ammo/40x46mm.json40
-rw-r--r--json/recipes/ammo/40x53mm.json9
2 files changed, 20 insertions, 29 deletions
diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json
index 643dda2..1d42eca 100644
--- a/json/recipes/ammo/40x46mm.json
+++ b/json/recipes/ammo/40x46mm.json
@@ -34,7 +34,7 @@
"batch_time_factors": [ 60, 5 ],
"book_learn": [ [ "textbook_anarch", 7 ] ],
"charges": 1,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ],
"tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ],
"components": [
@@ -103,15 +103,14 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ],
"tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m118_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
+ [ [ "smpistol_primer", 1 ] ],
+ [ [ "40x46mm_m118_casing", 1 ] ]
]
},
{
@@ -127,15 +126,14 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 12 ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 18 ] ],
"tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m199_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
+ [ [ "smpistol_primer", 1 ] ],
+ [ [ "40x46mm_m199_casing", 1 ] ]
]
},
{
@@ -151,15 +149,14 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 24 ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 36 ] ],
"tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m118_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
+ [ [ "smpistol_primer", 1 ] ],
+ [ [ "40x46mm_m118_casing", 1 ] ]
]
},
{
@@ -175,15 +172,14 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 24 ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 36 ] ],
"tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m199_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
+ [ [ "smpistol_primer", 1 ] ],
+ [ [ "40x46mm_m199_casing", 1 ] ]
]
},
{
@@ -202,12 +198,11 @@
"tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ], [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "combatnail", 70 ] ],
[ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m118_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
+ [ [ "smpistol_primer", 1 ] ],
+ [ [ "40x46mm_m118_casing", 1 ] ]
]
},
{
@@ -226,12 +221,11 @@
"tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ], [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "combatnail", 70 ] ],
[ [ "gunpowder", 30 ] ],
- [ [ "40x46mm_m199_casing", 1 ] ],
- [ [ "smpistol_primer", 1 ] ]
+ [ [ "smpistol_primer", 1 ] ],
+ [ [ "40x46mm_m199_casing", 1 ] ]
]
}
]
diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json
index 4b050c7..120dd3d 100644
--- a/json/recipes/ammo/40x53mm.json
+++ b/json/recipes/ammo/40x53mm.json
@@ -34,7 +34,7 @@
"batch_time_factors": [ 60, 5 ],
"book_learn": [ [ "textbook_anarch", 7 ] ],
"charges": 1,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 16 ] ],
+ "using": [ [ "shot_forming", 2 ] ],
"tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ],
"components": [
@@ -58,11 +58,10 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 16 ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 22 ] ],
"tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "gunpowder", 35 ] ],
[ [ "lgrifle_primer", 1 ] ],
@@ -82,11 +81,10 @@
"book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ],
"charges": 1,
"reversible": true,
- "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 32 ] ],
+ "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 44 ] ],
"tools": [ [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "gunpowder", 35 ] ],
[ [ "lgrifle_primer", 1 ] ],
@@ -109,7 +107,6 @@
"tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ], [ [ "swage", -1 ] ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
- [ [ "sheet_metal_small", 1 ] ],
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "combatnail", 100 ] ],
[ [ "gunpowder", 35 ] ],