diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-07-27 14:23:14 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-07-27 14:23:14 -0700 |
| commit | 33388a8e9a4f75c92b538a76628b4f0c656df492 (patch) | |
| tree | 37b090e7695955dd4b3b022ed6ecb77f3357d468 | |
| parent | Update readme (diff) | |
| download | cataclysm-dda-mod_grenade-crafting-33388a8e9a4f75c92b538a76628b4f0c656df492.tar.xz | |
Clean up and unify 40x53mm recipe and uncraft
| -rw-r--r-- | json/recipes/ammo/40x53mm.json | 15 | ||||
| -rw-r--r-- | json/uncraft/ammo/40x53mm.json | 35 |
2 files changed, 43 insertions, 7 deletions
diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json index 8256c38..423b3a5 100644 --- a/json/recipes/ammo/40x53mm.json +++ b/json/recipes/ammo/40x53mm.json @@ -14,11 +14,12 @@ "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities" : [ { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "pilot_light", 1 ] ], + [ [ "impact_fuze", 1 ] ], [ [ "sheet_metal_small", 1 ] ], - [ [ "chem_compositionb", 200 ] ], - [ [ "40x53mm_m169_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ] + [ [ "chem_compositionb", 48 ] ], + [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "40x53mm_m169_casing", 1 ] ] ] }, { @@ -38,10 +39,10 @@ "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "sheet_metal_small", 1 ] ], + [ [ "combatnail", 50 ] ], [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ], - [ [ "40x53mm_m169_casing", 1 ] ], - [ [ "lgrifle_primer", 1 ] ] + [ [ "lgrifle_primer", 1 ] ], + [ [ "40x53mm_m169_casing", 1 ] ] ] } ] diff --git a/json/uncraft/ammo/40x53mm.json b/json/uncraft/ammo/40x53mm.json new file mode 100644 index 0000000..e7efd8e --- /dev/null +++ b/json/uncraft/ammo/40x53mm.json @@ -0,0 +1,35 @@ +[ + { + "result": "40x53mm_m430a1", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 6, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "impact_fuze", 1 ] ], + [ [ "sheet_metal_small", 1 ] ], + [ [ "chem_compositionb", 48 ] ], + [ [ "gunpowder_shotgun", 35 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "40x53mm_m169_casing", 1 ] ] + ], + "flags": [ "UNCRAFT_SINGLE_CHARGE" ] + }, + { + "result": "40x53mm_m1001", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 6, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "combatnail", 50 ] ], + [ [ "gunpowder_shotgun", 35 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "40x53mm_m169_casing", 1 ] ] + ], + "flags": [ "UNCRAFT_SINGLE_CHARGE" ] + } +] |