From 3be56c6ab073002900643dd8e9506f4e416d1f58 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 4 Oct 2022 15:49:21 -0700 Subject: Replace the craftable 40mm grenades with handmade versions. -Much as before, just 90% as powerful. This brings them in line with other reloaded ammo. -This is save breaking. Fix the description of 40mm flechettes to reference M1001 like how 40mm buckshot references M576. -They still are not reloaded copies of M1001 or M576. Fix all improvised 40mm rounds to be flagged as homemade and able to misfire, just like reloaded. Reduce the uncraft time of improvised 40mm rounds to 3 minutes, just like factory 40mm rounds. --- json/items/ammo/40x46mm.json | 104 ++++++++++++++++++++++++++ json/items/ammo/40x53mm.json | 53 ++++++++++++++ json/recipes/ammo/40x46mm.json | 8 +- json/recipes/ammo/40x53mm.json | 4 +- json/uncraft/ammo/40x46mm.json | 161 +++++++++++++++++++++++++++++++++++++++++ json/uncraft/ammo/40x53mm.json | 81 +++++++++++++++++++++ 6 files changed, 405 insertions(+), 6 deletions(-) create mode 100644 json/items/ammo/40x46mm.json create mode 100644 json/items/ammo/40x53mm.json diff --git a/json/items/ammo/40x46mm.json b/json/items/ammo/40x46mm.json new file mode 100644 index 0000000..d7f855c --- /dev/null +++ b/json/items/ammo/40x46mm.json @@ -0,0 +1,104 @@ +[ + { + "id": "40x46mm_bootleg_m1006", + "copy-from": "40x46mm_m1006", + "type": "AMMO", + "name": { "str": "40x46mm M1006, handmade" }, + "proportional": { + "price": 0.7, + "damage": { "damage_type": "bullet", "amount": 0.9 }, + "dispersion": 1.1 + }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_bootleg_m433", + "copy-from": "40x46mm_m433", + "type": "AMMO", + "name": { "str": "40x46mm M433, handmade" }, + "proportional": { + "price": 0.7, + "damage": { "damage_type": "bullet", "amount": 0.9 }, + "dispersion": 1.1 + }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_bootleg_m576", + "copy-from": "40x46mm_m576", + "type": "AMMO", + "name": { "str": "40x46mm M576, handmade" }, + "proportional": { + "price": 0.7, + "damage": { "damage_type": "bullet", "amount": 0.9 }, + "dispersion": 1.1 + }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_bootleg_m651", + "copy-from": "40x46mm_grenade", + "type": "AMMO", + "name": { "str": "40x46mm M651, handmade" }, + "proportional": { + "price": 0.7, + "damage": { "damage_type": "bullet", "amount": 0.9 }, + "dispersion": 1.1 + }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_buckshot_m118", + "copy-from": "40x46mm_buckshot_m118", + "type": "AMMO", + "name": { "str": "40x46mm buckshot" }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_buckshot_m199", + "copy-from": "40x46mm_buckshot_m199", + "type": "AMMO", + "name": { "str": "40x46mm buckshot" }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_slug_m118", + "copy-from": "40x46mm_slug_m118", + "type": "AMMO", + "name": { "str": "40x46mm slug" }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_slug_m199", + "copy-from": "40x46mm_slug_m199", + "type": "AMMO", + "name": { "str": "40x46mm slug" }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_flechette_m118", + "copy-from": "40x46mm_flechette_m199", + "type": "AMMO", + "name": { "str": "40x46mm flechette" }, + "description": "An improvised 40x46mm flechette load somewhat resembling M1001.", + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x46mm_flechette_m199", + "copy-from": "40x46mm_flechette_m199", + "type": "AMMO", + "name": { "str": "40x46mm flechette" }, + "description": "An improvised 40x46mm flechette load somewhat resembling M1001.", + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + } +] diff --git a/json/items/ammo/40x53mm.json b/json/items/ammo/40x53mm.json new file mode 100644 index 0000000..48660d6 --- /dev/null +++ b/json/items/ammo/40x53mm.json @@ -0,0 +1,53 @@ +[ + { + "id": "40x53mm_bootleg_m1001", + "copy-from": "40x53mm_m1001", + "type": "AMMO", + "name": { "str": "40x53mm M1001, handmade" }, + "proportional": { + "price": 0.7, + "damage": { "damage_type": "bullet", "amount": 0.9 }, + "dispersion": 1.1 + }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x53mm_bootleg_m430a1", + "copy-from": "40x53mm_m430a1", + "type": "AMMO", + "name": { "str": "40x53mm M430A1, handmade" }, + "proportional": { + "price": 0.7, + "damage": { "damage_type": "bullet", "amount": 0.9 }, + "dispersion": 1.1 + }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x53mm_buckshot_m169", + "copy-from": "40x53mm_buckshot_m169", + "type": "AMMO", + "name": { "str": "40x53mm buckshot" }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x53mm_slug_m169", + "copy-from": "40x53mm_slug_m169", + "type": "AMMO", + "name": { "str": "40x53mm slug" }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "40x53mm_flechette_m169", + "copy-from": "40x53mm_flechette_m169", + "type": "AMMO", + "name": { "str": "40x53mm flechette" }, + "description": "An improvised 40x53mm flechette load somewhat resembling M1001.", + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ] } + } +] diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json index 4763481..fa00a20 100644 --- a/json/recipes/ammo/40x46mm.json +++ b/json/recipes/ammo/40x46mm.json @@ -1,6 +1,6 @@ [ { - "result": "40x46mm_m433", + "result": "40x46mm_bootleg_m433", "type": "recipe", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", @@ -23,7 +23,7 @@ ] }, { - "result": "40x46mm_m576", + "result": "40x46mm_bootleg_m576", "type": "recipe", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", @@ -45,7 +45,7 @@ ] }, { - "result": "40x46mm_m651", + "result": "40x46mm_bootleg_m651", "type" : "recipe", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", @@ -68,7 +68,7 @@ ] }, { - "result": "40x46mm_m1006", + "result": "40x46mm_bootleg_m1006", "type" : "recipe", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json index d73d126..bde2788 100644 --- a/json/recipes/ammo/40x53mm.json +++ b/json/recipes/ammo/40x53mm.json @@ -1,6 +1,6 @@ [ { - "result": "40x53mm_m430a1", + "result": "40x53mm_bootleg_m430a1", "type": "recipe", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", @@ -23,7 +23,7 @@ ] }, { - "result": "40x53mm_m1001", + "result": "40x53mm_bootleg_m1001", "type": "recipe", "category": "CC_AMMO", "subcategory": "CSC_AMMO_GRENADES", diff --git a/json/uncraft/ammo/40x46mm.json b/json/uncraft/ammo/40x46mm.json index 66cc560..b6e48ae 100644 --- a/json/uncraft/ammo/40x46mm.json +++ b/json/uncraft/ammo/40x46mm.json @@ -16,6 +16,23 @@ ], "charges": 1 }, + { + "result": "40x46mm_bootleg_m433", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "sheet_metal_small", 1 ] ], + [ [ "chem_compositionb", 288 ] ], + [ [ "impact_fuze", 1 ] ], + [ [ "gunpowder", 35 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m118_casing", 1 ] ] + ], + "charges": 1 + }, { "result": "40x46mm_m576", "type": "uncraft", @@ -32,6 +49,22 @@ ], "charges": 1 }, + { + "result": "40x46mm_bootleg_m576", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "lead", 18 ] ], + [ [ "gunpowder", 35 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m199_casing", 1 ] ] + ], + "charges": 1 + }, { "result": "40x46mm_m651", "type": "uncraft", @@ -49,6 +82,23 @@ ], "charges": 1 }, + { + "result": "40x46mm_bootleg_m651", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "bleach", 2 ] ], + [ [ "ammonia", 2 ] ], + [ [ "impact_fuze", 1 ] ], + [ [ "gunpowder", 35 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m195_casing", 1 ] ] + ], + "charges": 1 + }, { "result": "40x46mm_m1006", "type": "uncraft", @@ -63,5 +113,116 @@ [ [ "40x46mm_m212_casing", 1 ] ] ], "charges": 1 + }, + { + "result": "40x46mm_bootleg_m1006", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "rubber_slug", 2 ] ], + [ [ "gunpowder", 35 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m212_casing", 1 ] ] + ], + "charges": 1 + }, + { + "result": "40x46mm_buckshot_m118", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "lead", 18 ] ], + [ [ "gunpowder", 30 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m118_casing", 1 ] ] + ], + "charges": 1 + }, + { + "result": "40x46mm_buckshot_m199", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "lead", 18 ] ], + [ [ "gunpowder", 30 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m199_casing", 1 ] ] + ], + "charges": 1 + }, + { + "result": "40x46mm_slug_m118", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "lead", 36 ] ], + [ [ "gunpowder", 30 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m118_casing", 1 ] ] + ], + "charges": 1 + }, + { + "result": "40x46mm_slug_m199", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "lead", 36 ] ], + [ [ "gunpowder", 30 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m199_casing", 1 ] ] + ], + "charges": 1 + }, + { + "result": "40x46mm_flechette_m118", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "combatnail", 40 ] ], + [ [ "gunpowder", 30 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m118_casing", 1 ] ] + ], + "charges": 1 + }, + { + "result": "40x46mm_flechette_m199", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "combatnail", 40 ] ], + [ [ "gunpowder", 30 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "40x46mm_m199_casing", 1 ] ] + ], + "charges": 1 } ] diff --git a/json/uncraft/ammo/40x53mm.json b/json/uncraft/ammo/40x53mm.json index 35ddd49..c96ef39 100644 --- a/json/uncraft/ammo/40x53mm.json +++ b/json/uncraft/ammo/40x53mm.json @@ -16,6 +16,23 @@ ], "charges": 1 }, + { + "result": "40x53mm_bootleg_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", 288 ] ], + [ [ "gunpowder_shotgun", 35 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "40x53mm_m169_casing", 1 ] ] + ], + "charges": 1 + }, { "result": "40x53mm_m1001", "type": "uncraft", @@ -31,5 +48,69 @@ [ [ "40x53mm_m169_casing", 1 ] ] ], "charges": 1 + }, + { + "result": "40x53mm_bootleg_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 ] ] + ], + "charges": 1 + }, + { + "result": "40x53mm_buckshot_m169", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "lead", 22 ] ], + [ [ "gunpowder_shotgun", 35 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "40x53mm_m169_casing", 1 ] ] + ], + "charges": 1 + }, + { + "result": "40x53mm_slug_m169", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 m", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "PULL", "level": 1 } ], + "components": [ + [ [ "paper", 1 ] ], + [ [ "lead", 44 ] ], + [ [ "gunpowder_shotgun", 35 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "40x53mm_m169_casing", 1 ] ] + ], + "charges": 1 + }, + { + "result": "40x53mm_flechette_m169", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "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 ] ] + ], + "charges": 1 } ] -- cgit v1.2.1