Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explosives disassembly #37052

Merged
merged 12 commits into from
Apr 7, 2020
97 changes: 1 addition & 96 deletions data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -415,25 +415,6 @@
"stack_size": 100,
"count": 20
},
{
"type": "AMMO",
"id": "66mm_HEAT",
"price": 0,
"name": "66mm HEAT",
"symbol": "=",
"color": "dark_gray",
"description": "A 60mm high-explosive anti-tank round. It could blow through up to two feet of concrete.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
"weight": "1803 g",
"ammo_type": "66mm",
"damage": 2500,
"pierce": 400,
"range": 80,
"dispersion": 30,
"recoil": 225,
"effects": [ "COOKOFF", "EXPLOSIVE", "TRAIL" ]
},
{
"type": "AMMO",
"id": "120mm_HEAT",
Expand All @@ -444,7 +425,7 @@
"description": "A 120mm high-explosive anti-tank round. It could ruin anyone's whole day.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
"weight": "1803 g",
"weight": "22725 g",
"ammo_type": "120mm",
"damage": 40,
"pierce": 10,
Expand Down Expand Up @@ -718,82 +699,6 @@
"ammo_type": "components",
"count": 35
},
{
"type": "AMMO",
"id": "RPG-7_ammo",
"price": 10000,
"name": "PG-7VL 93mm rocket",
"symbol": "=",
"color": "dark_gray",
"description": "93mm single-stage high-explosive ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "1750 ml",
"weight": "2600 g",
"ammo_type": "RPG-7",
"damage": 3000,
"pierce": 750,
"range": 60,
"dispersion": 75,
"recoil": 450,
"effects": [ "COOKOFF", "EXPLOSIVE", "TRAIL", "NEVER_MISFIRES" ]
},
{
"type": "AMMO",
"id": "RPG-7_pg7vr",
"price": 10000,
"name": "PG-7VR 64mm/105mm rocket",
"symbol": "=",
"color": "dark_gray",
"description": "64mm/105mm high-explosive tandem ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "2250 ml",
"weight": "4500 g",
"ammo_type": "RPG-7",
"damage": 3250,
"pierce": 1450,
"range": 30,
"dispersion": 75,
"recoil": 450,
"effects": [ "COOKOFF", "EXPLOSIVE", "TRAIL", "NEVER_MISFIRES" ]
},
{
"type": "AMMO",
"id": "RPG-7_tbg7v",
"price": 10000,
"name": "TBG-7V 105mm rocket",
"symbol": "=",
"color": "dark_gray",
"description": "105mm thermobaric ammunition for the RPG-7.",
"material": [ "plastic", "powder" ],
"volume": "2250 ml",
"weight": "4500 g",
"ammo_type": "RPG-7",
"damage": 150,
"pierce": 10,
"range": 30,
"dispersion": 50,
"recoil": 450,
"effects": [ "COOKOFF", "TRAIL", "NEVER_MISFIRES", "NAPALM_BIG" ]
},
{
"type": "AMMO",
"id": "RPG-7_og7v",
"price": 8000,
"name": "OG-7V 40mm rocket",
"symbol": "=",
"color": "dark_gray",
"description": "40mm high-explosive fragmentation antipersonnel ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "1 L",
"weight": "2000 g",
"ammo_type": "RPG-7",
"damage": 80,
"pierce": 10,
"range": 45,
"dispersion": 50,
"recoil": 350,
"effects": [ "COOKOFF", "NEVER_MISFIRES", "FRAG" ]
},
{
"type": "AMMO",
"id": "generic_no_ammo",
Expand Down
21 changes: 20 additions & 1 deletion data/json/items/ammo/66mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"description": "66mm incendiary rockets used in the M202 FLASH rocket launcher. Their warheads are filled with a thickened pyrophoric agent, which burns at 2200 degrees Fahrenheit.",
"material": [ "steel", "powder" ],
"volume": "2 L",
"weight": "1140 g",
"weight": "1338 g",
"ammo_type": "m235",
"damage": 60,
"pierce": 10,
Expand All @@ -19,5 +19,24 @@
"recoil": 150,
"count": 4,
"effects": [ "COOKOFF", "PYROPHORIC", "TRAIL", "NEVER_MISFIRES" ]
},
{
"type": "AMMO",
"id": "66mm_HEAT",
"price": 200000,
"name": "66mm HEAT",
"symbol": "=",
"color": "dark_gray",
"description": "A 66mm high-explosive anti-tank round. It could blow through up to two feet of concrete.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
"weight": "2131 g",
"ammo_type": "66mm",
"damage": 2500,
"pierce": 400,
"range": 80,
"dispersion": 30,
"recoil": 225,
"effects": [ "COOKOFF", "EXPLOSIVE", "TRAIL" ]
}
]
78 changes: 78 additions & 0 deletions data/json/items/ammo/rpg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
[
{
"type": "AMMO",
"id": "RPG-7_ammo",
"price": 10000,
"name": "PG-7VL 93mm rocket",
"symbol": "=",
"color": "dark_gray",
"description": "93mm single-stage high-explosive ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "1750 ml",
"weight": "2600 g",
"ammo_type": "RPG-7",
"damage": 3000,
"pierce": 750,
"range": 60,
"dispersion": 75,
"recoil": 450,
"effects": [ "COOKOFF", "EXPLOSIVE", "TRAIL", "NEVER_MISFIRES" ]
},
{
"type": "AMMO",
"id": "RPG-7_pg7vr",
"price": 10000,
"name": "PG-7VR 64mm/105mm rocket",
"symbol": "=",
"color": "dark_gray",
"description": "64mm/105mm high-explosive tandem ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "2250 ml",
"weight": "4500 g",
"ammo_type": "RPG-7",
"damage": 3250,
"pierce": 1450,
"range": 30,
"dispersion": 75,
"recoil": 450,
"effects": [ "COOKOFF", "EXPLOSIVE", "TRAIL", "NEVER_MISFIRES" ]
},
{
"type": "AMMO",
"id": "RPG-7_tbg7v",
"price": 10000,
"name": "TBG-7V 105mm rocket",
"symbol": "=",
"color": "dark_gray",
"description": "105mm thermobaric ammunition for the RPG-7.",
"material": [ "plastic", "powder" ],
"volume": "2250 ml",
"weight": "4500 g",
"ammo_type": "RPG-7",
"damage": 150,
"pierce": 10,
"range": 30,
"dispersion": 50,
"recoil": 450,
"effects": [ "COOKOFF", "TRAIL", "NEVER_MISFIRES", "NAPALM_BIG" ]
},
{
"type": "AMMO",
"id": "RPG-7_og7v",
"price": 8000,
"name": "OG-7V 40mm rocket",
"symbol": "=",
"color": "dark_gray",
"description": "40mm high-explosive fragmentation antipersonnel ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "1 L",
"weight": "2000 g",
"ammo_type": "RPG-7",
"damage": 80,
"pierce": 10,
"range": 45,
"dispersion": 50,
"recoil": 350,
"effects": [ "COOKOFF", "NEVER_MISFIRES", "FRAG" ]
}
]
18 changes: 18 additions & 0 deletions data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,24 @@
"ammo_type": "components",
"count": 500
},
{
"type": "AMMO",
"id": "chem_compositionb",
"category": "chems",
"price": 7500,
"name": "composition b",
"name_plural": "composition b",
"symbol": "=",
"color": "brown",
"description": "Composition B is an explosive consisting of castable mixtures of RDX and TNT. It is used as the main explosive filling in artillery projectiles, rockets, land mines, hand grenades and various other munitions.",
"material": "powder",
"//": "Density of composition B is 1.65 g/cm3. Slightly rounded the volume from 303 to 300",
"volume": "300 ml",
"weight": "1 g",
"bashing": 1,
"ammo_type": "components",
"count": 500
},
{
"type": "AMMO",
"id": "chem_hmtd",
Expand Down
28 changes: 28 additions & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,34 @@
"weight": "5 g",
"volume": 0
},
{
"type": "GENERIC",
"id": "delay_fuze",
"symbol": ",",
"color": "light_gray",
"name": "delayed fuze",
"category": "spare_parts",
"description": "A complex mechanical fuze. It seems it can be used to detonate stable explosives after a short time by triggering it",
Night-Pryanik marked this conversation as resolved.
Show resolved Hide resolved
"price": 1000,
"price_postapoc": 250,
"material": [ "steel", "plastic" ],
"weight": "5 g",
"volume": 0
},
{
"type": "GENERIC",
"id": "impact_fuze",
"symbol": ",",
"color": "light_gray",
"name": "impact fuze",
"category": "spare_parts",
"description": "A complex mechanical fuze. It seems it can be used to detonate stable explosives upon a solid impact",
"price": 1000,
"price_postapoc": 250,
"material": [ "steel", "plastic" ],
"weight": "5 g",
"volume": 0
},
{
"type": "GENERIC",
"id": "toaster",
Expand Down
21 changes: 21 additions & 0 deletions data/json/recipes/weapon/explosive.json
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,27 @@
[ [ "chem_black_powder", 412 ], [ "chem_match_head_powder", 440 ], [ "gunpowder", 275 ] ]
]
},
{
"result": "pipebomb",
"type": "recipe",
"id_suffix": "stable",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_EXPLOSIVE",
"skill_used": "fabrication",
"skills_required": [ "cooking", 5 ],
"difficulty": 5,
"time": "15 m",
"reversible": true,
"book_learn": [ [ "manual_launcher", 4 ], [ "textbook_anarch", 5 ] ],
"tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ],
"qualities": [ { "id": "SAW_M", "level": 1 } ],
"components": [
[ [ "pipe", 1 ] ],
[ [ "fuse", 1 ] ],
[ [ "chem_compositionb", 225 ] ],
[ [ "chem_black_powder", 10 ], [ "chem_match_head_powder", 10 ], [ "gunpowder", 5 ] ]
]
},
{
"result": "tool_black_powder_charge",
"type": "recipe",
Expand Down
18 changes: 18 additions & 0 deletions data/json/uncraft/ammo/120mm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[
{
"result": "120mm_HEAT",
"type": "uncraft",
"skill_used": "fabrication",
"difficulty": 6,
"time": "10 m",
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [
[ [ "copper", 2500 ] ],
[ [ "chem_compositionb", 6000 ] ],
[ [ "gunpowder_artillery", 100 ] ],
[ [ "impact_fuze", 1 ] ],
[ [ "scrap", 25 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
47 changes: 47 additions & 0 deletions data/json/uncraft/ammo/40x46mm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[
{
"result": "40x46mm_m1006",
"type": "uncraft",
"skill_used": "fabrication",
"difficulty": 4,
"time": "3 m",
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_shotgun", 35 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "40x46mm_m433",
"type": "uncraft",
"skill_used": "fabrication",
"difficulty": 4,
"time": "3 m",
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "smpistol_primer", 1 ] ], [ [ "combatnail", 70 ] ], [ [ "gunpowder_shotgun", 35 ] ], [ [ "impact_fuze", 1 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "40x46mm_m576",
"type": "uncraft",
"skill_used": "fabrication",
"difficulty": 4,
"time": "3 m",
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [
[ [ "smpistol_primer", 1 ] ],
[ [ "chem_compositionb", 32 ] ],
[ [ "gunpowder_shotgun", 35 ] ],
[ [ "impact_fuze", 1 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "40x46mm_m651",
"type": "uncraft",
"skill_used": "fabrication",
"difficulty": 4,
"time": "3 m",
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_shotgun", 35 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
Loading