diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-06-13 02:51:23 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-06-13 02:51:23 -0700 |
| commit | 080bf7ccdece578f7c9b34c3cab9e0c9173eabb0 (patch) | |
| tree | 8adac29946e41f5daa685bfa33464858648aa794 /json/recipes/ammo | |
| parent | Allow 40x46mm reloaded shotgun rounds to use mixed gunpowder (diff) | |
| download | cataclysm-bn-mod_recipe-fixes-080bf7ccdece578f7c9b34c3cab9e0c9173eabb0.tar.xz | |
Clean up primer and gunpowder use in 40x46mm and 40x53mm grenades.
Diffstat (limited to 'json/recipes/ammo')
| -rw-r--r-- | json/recipes/ammo/40x46mm.json | 6 | ||||
| -rw-r--r-- | json/recipes/ammo/40x53mm.json | 74 |
2 files changed, 77 insertions, 3 deletions
diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json index a5dd17f..d689934 100644 --- a/json/recipes/ammo/40x46mm.json +++ b/json/recipes/ammo/40x46mm.json @@ -44,7 +44,7 @@ [ [ "paper", 1 ], [ "wax", 1 ] ], [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], [ [ "40x46mm_m199_casing", 1 ] ], - [ [ "lgpistol_primer", 1 ] ] + [ [ "smpistol_primer", 1 ] ] ] }, { @@ -92,7 +92,7 @@ [ [ "paper", 1 ], [ "wax", 1 ] ], [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], [ [ "40x46mm_m199_casing", 1 ] ], - [ [ "lgpistol_primer", 1 ] ] + [ [ "smpistol_primer", 1 ] ] ] }, { @@ -140,7 +140,7 @@ [ [ "combatnail", 70 ] ], [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], [ [ "40x46mm_m199_casing", 1 ] ], - [ [ "lgpistol_primer", 1 ] ] + [ [ "smpistol_primer", 1 ] ] ] } ] diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json new file mode 100644 index 0000000..f1f54f8 --- /dev/null +++ b/json/recipes/ammo/40x53mm.json @@ -0,0 +1,74 @@ +[ + { + "result": "40x53mm_buckshot_m169", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "shot_forming", 2 ], [ "ammo_bullet", 16 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] + }, + { + "result": "40x53mm_slug_m169", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 16 ] ], + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] + }, + { + "result": "40x53mm_flechette_m169", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_SHOT", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "launcher", 2 ], + "time": "10 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], + "charges": 1, + "reversible": true, + "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "paper", 1 ], [ "wax", 1 ] ], + [ [ "combatnail", 100 ] ], + [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ], + [ [ "40x53mm_m169_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ] + ] + } +] |