Skip to content

Commit

Permalink
Merge pull request CleverRaven#19824 from Cyrano7/40mm
Browse files Browse the repository at this point in the history
Craft one 40mm shell at a time
  • Loading branch information
Rivet-the-Zombie authored Dec 22, 2016
2 parents e79ded4 + 60cbee2 commit 3a27c80
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 27 deletions.
44 changes: 18 additions & 26 deletions data/json/recipes/ammo/grenades.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,38 @@
[
{
"result": "40mm_flechette",
"type" : "recipe",
"type": "recipe",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_GRENADES",
"skill_used": "fabrication",
"skills_required": [ "gun", 2 ],
"difficulty": 4,
"time": 15000,
"skills_required": [ "gun", 2 ],
"time": 3750,
"batch_time_factors": [ 50, 10 ],
"reversible": true,
"book_learn": [ [ "manual_launcher", 4 ] , [ "manual_shotgun", 6 ] ],
"tools": [
[ [ "press", -1 ] ],
[ [ "fire", -1 ], [ "toolset", 10 ], [ "press", 10 ] ]
],
"book_learn": [ [ "manual_launcher", 4 ], [ "manual_shotgun", 6 ] ],
"charges": 1,
"using": [ [ "ammo_40mm", 1 ] ],
"tools": [ [ [ "press", -1 ] ] ],
"components": [
[ [ "40mm_casing", 4 ] ],
[ [ "shotgun_primer", 4 ] ],
[ [ "gunpowder", 160 ] ],
[ [ "combatnail", 100 ] ]
[ [ "gunpowder", 40 ] ],
[ [ "combatnail", 25 ] ]
]
},
{
"result": "40mm_shot",
"type" : "recipe",
"type": "recipe",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_GRENADES",
"skill_used": "fabrication",
"skills_required": [ "gun", 2 ],
"difficulty": 4,
"time": 15000,
"skills_required": [ "gun", 2 ],
"time": 3750,
"batch_time_factors": [ 50, 10 ],
"reversible": true,
"book_learn": [ [ "manual_launcher", 4 ] , [ "manual_shotgun", 6 ] ],
"tools": [
[ [ "press", -1 ] ],
[ [ "fire", -1 ], [ "toolset", 10 ], [ "press", 10 ] ]
],
"components": [
[ [ "40mm_casing", 4 ] ],
[ [ "shotgun_primer", 4 ] ],
[ [ "gunpowder", 160 ] ],
[ [ "lead", 50 ] ]
]
"book_learn": [ [ "manual_launcher", 4 ], [ "manual_shotgun", 6 ] ],
"charges": 1,
"using": [ [ "bullet_forming", 2 ], [ "ammo_40mm", 1 ], [ "ammo_bullet", 12 ] ],
"components": [ [ [ "gunpowder", 40 ] ] ]
}
]
11 changes: 10 additions & 1 deletion data/json/requirements/ammo.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"id": "ammo_40mm",
"type": "requirement",
"//": "Components required for 40mm ammo",
"components": [
[ [ "40mm_casing", 1 ] ],
[ [ "shotgun_primer", 1 ] ]
]
},
{
"id": "ammo_762_25",
"type": "requirement",
Expand All @@ -19,7 +28,7 @@
{
"id": "ammo_shot",
"type": "requirement",
"//": "Components required for shotgun ammo",
"//": "Components required for shotgun and signal flare ammo",
"components": [
[ [ "shot_hull", 1 ] ],
[ [ "shotgun_primer", 1 ] ]
Expand Down

0 comments on commit 3a27c80

Please sign in to comment.