From 007f9bf188f56166d0b86aeb8b39a8d7c76eedd0 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Tue, 8 Aug 2023 14:18:52 -0700 Subject: [PATCH] Matchhead powder loaded bullets (#67453) * add 38 matchhead bullets * comma * Update data/json/items/ammo/38.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/ammo/38.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update 38.json * matchhead bullets can cause pressure damage * document MATCHHEAD * extend and delete * red phosphorus adjustments * Update chemicals_and_resources.json * red phosphorus recipe * Update src/ranged.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * matchhead 22lr bullets * 10mm matchhead * 30 carbine blackpowder * matchhead 32 acp * fix issue * matchhead 357 magnum * 357 sig matchheads * matchhead .380 * matchhead .40 * matchhead 45 acp * matchhead 9mm * matchhead 9x18mm * fix description * matchhead 45 acp * matchhead 762x25 * Update 380.json * Update 38.json * Update 38.json * matchhead recipes * matchhead recipes * add missing recipe * Update dictionary.txt * red_phosphorous * Update rifle.json * Update 38.json * Update 38.json * describe matchhead * increase red phosphorous requirements * increase red phosphorous req * red phosphorus spawns * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * readd muzzle smoke * astyle Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * phosphorous * migrations * matchhead generic ammos * matchhead tiny pistol ammos * 30 carbine migration * pistol handloads with matchheadpowder * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/itemgroups/supplies.json | 1 + data/json/items/ammo/10mm.json | 11 + data/json/items/ammo/22.json | 22 ++ data/json/items/ammo/30carbine.json | 11 + data/json/items/ammo/32.json | 11 + data/json/items/ammo/357mag.json | 22 ++ data/json/items/ammo/357sig.json | 22 ++ data/json/items/ammo/38.json | 22 ++ data/json/items/ammo/380.json | 22 ++ data/json/items/ammo/40.json | 22 ++ data/json/items/ammo/45.json | 22 ++ data/json/items/ammo/45colt.json | 11 + data/json/items/ammo/762x25.json | 11 + data/json/items/ammo/9mm.json | 22 ++ data/json/items/ammo/9x18.json | 22 ++ data/json/items/chemicals_and_resources.json | 13 +- data/json/recipes/ammo/pistol.json | 360 ++++++++++++++++++ data/json/recipes/ammo/rifle.json | 61 +++ data/json/recipes/chem/drugs.json | 2 +- .../json/recipes/recipe_medsandchemicals.json | 5 +- data/json/requirements/explosives.json | 2 +- .../Generic_Guns/ammo/gg_ammo_migration.json | 38 ++ data/mods/Generic_Guns/ammo/pistol.json | 16 + data/mods/Generic_Guns/ammo/pistol_tiny.json | 16 + .../Generic_Guns/recipes/recipes_pistol.json | 28 ++ doc/JSON_FLAGS.md | 1 + src/item.cpp | 7 +- src/ranged.cpp | 6 +- tools/spell_checker/dictionary.txt | 1 + 29 files changed, 796 insertions(+), 14 deletions(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index df476224cd9b8..070f830a5ebea 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -379,6 +379,7 @@ [ "chem_aluminium_powder", 10 ], [ "chem_aluminium_sulphate", 10 ], [ "chem_saltpetre", 10 ], + { "item": "red_phosphorous", "prob": 5, "charges-min": 100 }, { "item": "bismuth", "prob": 5, "charges-min": 1 }, { "item": "chem_benzene", "prob": 10, "charges-min": 1 }, { "item": "chem_toluene", "prob": 10, "charges-min": 1 }, diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json index 0b76ee76a992d..31c8c61cab1e2 100644 --- a/data/json/items/ammo/10mm.json +++ b/data/json/items/ammo/10mm.json @@ -47,5 +47,16 @@ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_10mm_fmj", + "copy-from": "bp_10mm_fmj", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": "10mm Auto FMJ, matchhead powder" }, + "description": "Jacketed 10mm Auto ammunition with a 180gr bullet. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_10mm_fmj", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json index 29543e2c5d5b7..649bb4f5abe4d 100644 --- a/data/json/items/ammo/22.json +++ b/data/json/items/ammo/22.json @@ -111,5 +111,27 @@ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_22_fmj", + "copy-from": "bp_22_fmj", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".22 FMJ, matchhead powder" }, + "description": ".22 Long Rifle ammunition with a 30gr FMJ bullet. The .22LR round is extremely weak, with short range and negligible recoil. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_22_fmj", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_22_lr", + "copy-from": "bp_22_lr", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".22 LR, matchhead powder" }, + "description": ".22 Long Rifle ammunition with a 30gr FMJ bullet. The .22LR round is extremely weak, with short range and negligible recoil. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_22_lr", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/30carbine.json b/data/json/items/ammo/30carbine.json index 26be08cc6d71f..f6d123ff7e780 100644 --- a/data/json/items/ammo/30carbine.json +++ b/data/json/items/ammo/30carbine.json @@ -45,5 +45,16 @@ "name": { "str_sp": ".30 Carbine, reloaded" }, "description": ".30 Carbine ammunition with a 110gr full metal jacket bullet. This one has been hand-reloaded, leading to slightly inferior performance compared to factory-produced ammo.", "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 } + }, + { + "id": "matchhead_30carbine", + "copy-from": "bp_30carbine", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".30 Carbine, matchhead powder" }, + "description": ".30 Carbine ammunition with a 110gr full metal jacket bullet. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_30carbine", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/32.json b/data/json/items/ammo/32.json index 36c15a74d1d46..7969f1ed270a6 100644 --- a/data/json/items/ammo/32.json +++ b/data/json/items/ammo/32.json @@ -47,5 +47,16 @@ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_32_acp", + "copy-from": "bp_32_acp", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".32 ACP, matchhead powder" }, + "description": "A .32 ACP round, once a popular handgun cartridge in the 20th century. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_32_acp", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/357mag.json b/data/json/items/ammo/357mag.json index 75c07c58899d4..6bae63a253c90 100644 --- a/data/json/items/ammo/357mag.json +++ b/data/json/items/ammo/357mag.json @@ -76,5 +76,27 @@ "name": { "str_sp": ".357 Magnum JHP, reloaded" }, "description": "Jacketed hollow point .357 Magnum ammunition. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 } + }, + { + "id": "matchhead_357mag_fmj", + "copy-from": "bp_357mag_fmj", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".357 Magnum FMJ, matchhead powder" }, + "description": "Jacketed .357 Magnum ammunition. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_357mag_fmj", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_357mag_jhp", + "copy-from": "bp_357mag_jhp", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".357 Magnum JHP, matchhead powder" }, + "description": "Jacketed hollow point .357 Magnum ammunition. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_357mag_jhp", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/357sig.json b/data/json/items/ammo/357sig.json index e99e8a8c0e34a..eb459bd5c17f7 100644 --- a/data/json/items/ammo/357sig.json +++ b/data/json/items/ammo/357sig.json @@ -80,5 +80,27 @@ }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_357sig_fmj", + "copy-from": "bp_357sig_fmj", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".357 SIG FMJ, matchhead powder" }, + "description": "Jacketed .357 SIG ammunition. The .357 SIG round is a high velocity pistol cartridge, giving it a flatter trajectory than many handgun rounds. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_357sig_fmj", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_357sig_jhp", + "copy-from": "bp_357sig_jhp", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".357 SIG JHP, matchhead powder" }, + "description": "Jacketed hollow point .357 SIG ammunition. The .357 SIG round is a high velocity pistol cartridge, giving it a flatter trajectory than many handgun rounds. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_357sig_jhp", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/38.json b/data/json/items/ammo/38.json index 26cef7d92c604..3da664fff057e 100644 --- a/data/json/items/ammo/38.json +++ b/data/json/items/ammo/38.json @@ -104,5 +104,27 @@ }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_38_fmj", + "copy-from": "bp_38_fmj", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".38 FMJ, matchhead powder" }, + "description": ".38 Special ammunition with a brass jacketed 130gr FMJ bullet. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_38_fmj", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_38_special", + "copy-from": "bp_38_special", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".38 Special, matchhead powder" }, + "description": ".38 Special ammunition with a 130gr FMJ bullet. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_38_special", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/380.json b/data/json/items/ammo/380.json index f4ac144333dcc..816bcb9ae6fed 100644 --- a/data/json/items/ammo/380.json +++ b/data/json/items/ammo/380.json @@ -103,5 +103,27 @@ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_380_FMJ", + "copy-from": "bp_380_FMJ", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".380 ACP FMJ, matchhead powder" }, + "description": ".380 ACP ammunition with a brass jacketed 95gr bullet. Popular in pocket pistols for over a century, it is often considered the weakest caliber to consider for self-defense. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_380_FMJ", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_380_JHP", + "copy-from": "bp_380_JHP", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".380 ACP JHP, matchhead powder" }, + "description": ".380 ACP ammunition with a jacketed hollow point 95gr bullet. Popular in pocket pistols for over a century, it is often considered the weakest caliber to consider for self-defense. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_380_JHP", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/40.json b/data/json/items/ammo/40.json index ced5473173e4a..88d9c32c4c7d2 100644 --- a/data/json/items/ammo/40.json +++ b/data/json/items/ammo/40.json @@ -80,5 +80,27 @@ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_40fmj", + "copy-from": "bp_40fmj", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".40 S&W FMJ, matchhead powder" }, + "description": ".40 S&W ammunition with a 180gr FMJ bullet. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_40fmj", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_40sw", + "copy-from": "bp_40sw", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".40 S&W JHP, matchhead powder" }, + "description": ".40 S&W ammunition with a 135gr JHP bullet. The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_40sw", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/45.json b/data/json/items/ammo/45.json index 49540e1ed41de..09d83431e9de6 100644 --- a/data/json/items/ammo/45.json +++ b/data/json/items/ammo/45.json @@ -102,5 +102,27 @@ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_45_acp", + "copy-from": "bp_45_acp", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".45 FMJ, matchhead powder" }, + "description": ".45 ACP ammunition with a 230gr FMJ bullet. Due to a reputation for effectiveness, the .45 ACP round has been common for over a century. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_45_acp", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_45_jhp", + "copy-from": "bp_45_jhp", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".45 ACP JHP, matchhead powder" }, + "description": ".45 ACP ammunition with a 185gr JHP bullet. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_45_jhp", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/45colt.json b/data/json/items/ammo/45colt.json index 8510500eb3d5d..4257a05511c16 100644 --- a/data/json/items/ammo/45colt.json +++ b/data/json/items/ammo/45colt.json @@ -47,5 +47,16 @@ }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_45colt_jhp", + "copy-from": "bp_45colt_jhp", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": ".45 Colt JHP, matchhead powder" }, + "description": ".45 Colt ammunition with a 250gr jacketed hollow point bullet. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_45colt_jhp", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/762x25.json b/data/json/items/ammo/762x25.json index 2996baefb2f79..62dd909576cba 100644 --- a/data/json/items/ammo/762x25.json +++ b/data/json/items/ammo/762x25.json @@ -71,5 +71,16 @@ "name": { "str_sp": "7.62x25mm, reloaded" }, "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 } + }, + { + "id": "matchhead_762_25", + "copy-from": "bp_762_25", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": "7.62x25mm, matchhead powder" }, + "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_762_25", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/9mm.json b/data/json/items/ammo/9mm.json index b7b605ec02e77..f7c17e3b11a1c 100644 --- a/data/json/items/ammo/9mm.json +++ b/data/json/items/ammo/9mm.json @@ -126,5 +126,27 @@ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_9mmfmj", + "copy-from": "bp_9mmfmj", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": "9x19mm FMJ, matchhead powder" }, + "description": "9x19mm ammunition with a brass jacketed 115gr bullet. It has been a popular round for military, law enforcement, and civilian use for over a century. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_9mmfmj", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_9mm", + "copy-from": "bp_9mm", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": "9x19mm JHP, matchhead powder" }, + "description": "9x19mm ammunition with a 116gr jacketed hollow point bullet. JHP rounds have inferior penetration to FMJ rounds, but their expansion slightly increases stopping power against unarmored targets and reduces overpenetration. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_9mm", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/ammo/9x18.json b/data/json/items/ammo/9x18.json index 2755225a16381..a0eb7186a3c45 100644 --- a/data/json/items/ammo/9x18.json +++ b/data/json/items/ammo/9x18.json @@ -106,5 +106,27 @@ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "matchhead_9x18mmfmj", + "copy-from": "bp_9x18mmfmj", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": "9x18mm FMJ, matchhead powder" }, + "description": "9x18mm Makarov RG028 ammunition. The RG028 round uses a bullet with a hardened steel core to improve armor penetration. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_9x18mmfmj", + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_9x18mm", + "copy-from": "bp_9x18mm", + "type": "AMMO", + "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder", + "name": { "str_sp": "9x18mm, matchhead powder" }, + "description": "9x18mm Makarov ammunition with a 93gr steel core FMJ bullet. The 9x18mm round was very common in the Eastern Bloc during the 20th century, and remained in Russian military service into the 21st. This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads. Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure. As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.", + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "looks_like": "bp_9x18mm", + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index acf8b4a71d060..06f8f75041ec0 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -1939,16 +1939,17 @@ "ammo_type": "components", "category": "chems", "name": { "str_sp": "red phosphorous" }, - "description": "An allotrope of the element phosphorous. It's what you use to light matches, but can also be used in the synthesis of methamphetamine.", - "weight": "1800 mg", - "volume": "100 ml", - "//": "Density around 2.2g/cm3, but since it's a powder, it's a bit lower, around 1.8 g/cm3", - "container": "box_small", + "description": "An allotrope of the element phosphorous. It's what you use to light matches, but can also be used in the synthesis of methamphetamine. You could use it to make bombs, and if you were truly desperate you might even be able to use it as a propellant for bullets.", + "weight": "100 mg", + "volume": "5 ml", + "//": "Density around 2.2g/cm3, but since it's a powder, it's a bit lower, around 1.8-2.0 g/cm3", + "container": "bag_plastic", "symbol": "=", "color": "red", "price": 50, "price_postapoc": 2, - "count": 100 + "count": 10000, + "stack_size": 25 }, { "id": "acetic_anhydride", diff --git a/data/json/recipes/ammo/pistol.json b/data/json/recipes/ammo/pistol.json index b123950136de0..f3a1994fe607a 100644 --- a/data/json/recipes/ammo/pistol.json +++ b/data/json/recipes/ammo/pistol.json @@ -1303,5 +1303,365 @@ "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "278 mg gunpowder rounded to 3 100 mg 'pieces'", "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_9mm", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "gun", 4 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 1 ], [ "manual_smg", 1 ], [ "recipe_bullets", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_9mmfmj", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_40fmj", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "gun", 4 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_40sw", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 2 ], [ "recipe_bullets", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 6 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_32_acp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 2, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 5 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 2 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_38_fmj", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "gun", 4 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 2 ], [ "recipe_bullets", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_38_special", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 1 ], [ "recipe_bullets", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 3 ] ] ] + }, + { + "result": "matchhead_45_acp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous", 3 ] ], [ [ "copper", 2 ] ] ] + }, + { + "result": "matchhead_45_jhp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous", 5 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_762_25", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 4 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_762_25", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_9x18mm", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_9x18mmfmj", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "gun", 4 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_380_JHP", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 4, + "skills_required": [ "gun", 4 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 1 ], [ "manual_smg", 1 ], [ "recipe_bullets", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_380_FMJ", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_357sig_fmj", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 7 ], [ "ammo_357sig", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_357sig_jhp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 8 ], [ "ammo_357sig", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_357mag_fmj", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_357mag", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_357mag_jhp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ], [ "ammo_357mag", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_10mm_fmj", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_10mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_45colt_jhp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_PISTOL", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 3 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 5 ], [ "ammo_45colt", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 2 ] ] ] } ] diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json index b070d3e5c48f8..508b1227def28 100644 --- a/data/json/recipes/ammo/rifle.json +++ b/data/json/recipes/ammo/rifle.json @@ -1717,5 +1717,66 @@ [ [ "copper", 3 ] ], [ [ "incendiary", 6 ] ] ] + }, + { + "result": "matchhead_22_fmj", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "22_casing_new", 1 ] ], [ [ "red_phosphorous", 1 ] ], [ [ "copper", 1 ] ] ] + }, + { + "result": "matchhead_22_lr", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ [ [ "22_casing_new", 1 ] ], [ [ "red_phosphorous", 1 ] ] ] + }, + { + "result": "matchhead_30carbine", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_RIFLE", + "skill_used": "fabrication", + "difficulty": 5, + "skills_required": [ "gun", 5 ], + "time": "2 m", + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], + "charges": 1, + "reversible": true, + "using": [ [ "bullet_forming", 20 ] ], + "//": "971 mg gunpowder rounded to 10 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], + "components": [ + [ [ "30carbine_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "red_phosphorous", 10 ] ], + [ [ "lead", 1 ] ], + [ [ "copper", 1 ] ] + ] } ] diff --git a/data/json/recipes/chem/drugs.json b/data/json/recipes/chem/drugs.json index da86a6693baeb..ddc391dadf9b1 100644 --- a/data/json/recipes/chem/drugs.json +++ b/data/json/recipes/chem/drugs.json @@ -72,7 +72,7 @@ "components": [ [ [ "dayquil", 15 ] ], [ [ "iodine_crystal", 15 ] ], - [ [ "red_phosphorous", 15 ] ], + [ [ "red_phosphorous", 270 ] ], [ [ "chem_acetone", 1 ] ], [ [ "chem_methanol", 3 ] ], [ [ "lye_powder", 5 ], [ "chem_potassium_hydroxide", 25 ], [ "lye", 1 ], [ "lye_potassium", 1 ] ] diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 5944eb53cd548..fdbe26e035d44 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1423,8 +1423,9 @@ "skill_used": "fabrication", "time": "10 m", "autolearn": true, - "qualities": [ { "id": "FINE_GRIND", "level": 1 } ], - "tools": [ [ [ "matches", 20 ], [ "ref_matches", 20 ] ] ] + "qualities": [ { "id": "FINE_GRIND", "level": 1 }, { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "sieve_steel", -1 ] ] ], + "components": [ [ [ "match", 85 ] ] ] }, { "type": "recipe", diff --git a/data/json/requirements/explosives.json b/data/json/requirements/explosives.json index a9b957c7cb067..3db48b2bf1918 100644 --- a/data/json/requirements/explosives.json +++ b/data/json/requirements/explosives.json @@ -48,7 +48,7 @@ [ [ "chem_black_powder", 90 ], [ "gunpowder", 90 ], - [ "red_phosphorous", 18 ], + [ "red_phosphorous", 100 ], [ "gunpowder_pistol", 90 ], [ "gunpowder_shotgun", 90 ], [ "gunpowder_magnum_pistol", 80 ], diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index 322fd66eea89e..2d27bf10fa8f3 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -14,6 +14,11 @@ "type": "MIGRATION", "replace": "bp_tiny_pistol_ball" }, + { + "id": [ "matchhead_22_fmj", "matchhead_22_lr", "matchhead_32_acp" ], + "type": "MIGRATION", + "replace": "matchhead_tiny_pistol_ball" + }, { "id": [ "22_cb", "22_lr", "22_ratshot" ], "type": "MIGRATION", @@ -99,6 +104,23 @@ "type": "MIGRATION", "replace": "bp_pistol_ball" }, + { + "id": [ + "matchhead_10mm_fmj", + "matchhead_357sig_fmj", + "matchhead_38_fmj", + "matchhead_380_FMJ", + "matchhead_40ball", + "matchhead_40fmj", + "matchhead_45_acp", + "matchhead_9mmfmj", + "matchhead_9x18mmfmj", + "matchhead_357mag_fmj", + "matchhead_30carbine" + ], + "type": "MIGRATION", + "replace": "matchhead_pistol_ball" + }, { "id": [ "357sig_jhp", @@ -149,6 +171,22 @@ "type": "MIGRATION", "replace": "bp_pistol_jhp" }, + { + "id": [ + "matchhead_357sig_jhp", + "matchhead_38_special", + "matchhead_380_JHP", + "matchhead_40sw", + "matchhead_45_jhp", + "matchhead_45colt_jhp", + "matchhead_762_25", + "matchhead_9mm", + "matchhead_9x18mm", + "matchhead_357mag_jhp" + ], + "type": "MIGRATION", + "replace": "matchhead_pistol_jhp" + }, { "id": [ "357mag_fmj", "44fmj", "460_fmj" ], "type": "MIGRATION", diff --git a/data/mods/Generic_Guns/ammo/pistol.json b/data/mods/Generic_Guns/ammo/pistol.json index a53027829f055..3a827d9edc67e 100644 --- a/data/mods/Generic_Guns/ammo/pistol.json +++ b/data/mods/Generic_Guns/ammo/pistol.json @@ -59,5 +59,21 @@ }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } + }, + { + "id": "matchhead_pistol_ball", + "copy-from": "bp_pistol_ball", + "type": "AMMO", + "name": { "str_sp": "pistol ammo, ball (matchhead powder)" }, + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_pistol_jhp", + "copy-from": "bp_pistol_jhp", + "type": "AMMO", + "name": { "str_sp": "pistol ammo, JHP (matchhead powder)" }, + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/mods/Generic_Guns/ammo/pistol_tiny.json b/data/mods/Generic_Guns/ammo/pistol_tiny.json index f9cde8e74da70..a8bdfa99c2c4b 100644 --- a/data/mods/Generic_Guns/ammo/pistol_tiny.json +++ b/data/mods/Generic_Guns/ammo/pistol_tiny.json @@ -66,5 +66,21 @@ "type": "AMMO", "copy-from": "22_blank", "name": { "str_sp": "pistol blank" } + }, + { + "id": "matchhead_tiny_pistol_ball", + "copy-from": "bp_tiny_pistol_ball", + "type": "AMMO", + "name": { "str_sp": "tiny pistol ammo, ball (matchhead powder)" }, + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "extend": { "effects": [ "MATCHHEAD" ] } + }, + { + "id": "matchhead_tiny_pistol_jhp", + "copy-from": "bp_tiny_pistol_jhp", + "type": "AMMO", + "name": { "str_sp": "tiny pistol ammo, JHP (matchhead powder)" }, + "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 }, + "extend": { "effects": [ "MATCHHEAD" ] } } ] diff --git a/data/mods/Generic_Guns/recipes/recipes_pistol.json b/data/mods/Generic_Guns/recipes/recipes_pistol.json index 3aecbce280fe9..9479270e4b9f3 100644 --- a/data/mods/Generic_Guns/recipes/recipes_pistol.json +++ b/data/mods/Generic_Guns/recipes/recipes_pistol.json @@ -24,6 +24,13 @@ "copy-from": "reloaded_tiny_pistol_jhp", "components": [ [ [ "chem_black_powder", 2 ] ] ] }, + { + "result": "matchhead_tiny_pistol_jhp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "copy-from": "reloaded_tiny_pistol_jhp", + "components": [ [ [ "red_phosphorous", 2 ] ] ] + }, { "result": "reloaded_tiny_pistol_ball", "type": "recipe", @@ -40,6 +47,13 @@ "copy-from": "reloaded_tiny_pistol_ball", "components": [ [ [ "chem_black_powder", 2 ] ], [ [ "copper", 1 ] ] ] }, + { + "result": "matchhead_tiny_pistol_ball", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "copy-from": "reloaded_tiny_pistol_ball", + "components": [ [ [ "red_phosphorous", 2 ] ], [ [ "copper", 1 ] ] ] + }, { "result": "reloaded_pistol_jhp", "type": "recipe", @@ -65,6 +79,13 @@ "copy-from": "reloaded_pistol_jhp", "components": [ [ [ "chem_black_powder", 4 ] ] ] }, + { + "result": "matchhead_pistol_jhp", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "copy-from": "reloaded_pistol_jhp", + "components": [ [ [ "red_phosphorous", 4 ] ] ] + }, { "result": "reloaded_pistol_ball", "type": "recipe", @@ -84,6 +105,13 @@ "copy-from": "reloaded_pistol_ball", "components": [ [ [ "chem_black_powder", 4 ] ], [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] ] }, + { + "result": "matchhead_pistol_ball", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "copy-from": "reloaded_pistol_ball", + "components": [ [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] ] + }, { "result": "reloaded_pistol_magnum_jhp", "type": "recipe", diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md index 4725b18d6c2f6..c62e80c39becf 100644 --- a/doc/JSON_FLAGS.md +++ b/doc/JSON_FLAGS.md @@ -229,6 +229,7 @@ These are handled through `ammo_types.json`. You can tag a weapon with these to - ```LASER``` Creates a trail of laser (the field type). - ```LIGHTNING``` Creates a trail of lightning. - ```magic``` Always best possible hit, do nothing special, no damage mults, nothing. +- ```MATCHHEAD``` Bullet has a chance of damaging the gun from overpressure regardless of fouling level. - ```MININUKE_MOD``` Small thermo-nuclear detonation that leaves behind radioactive fallout. - ```MUZZLE_SMOKE``` Generate a small cloud of smoke at the source. - ```NAPALM``` Explosion that spreads fire. diff --git a/src/item.cpp b/src/item.cpp index 7ae0b3d9ccc05..b7b5803e4a8e1 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -2801,8 +2801,13 @@ void item::ammo_info( std::vector &info, const iteminfo_query *parts, parts->test( iteminfo_parts::AMMO_FX_RECYCLED ) ) { fx.emplace_back( _( "This ammo has been hand-loaded." ) ); } - if( ammo.ammo_effects.count( "BLACKPOWDER" ) && + if( ammo.ammo_effects.count( "MATCHHEAD" ) && parts->test( iteminfo_parts::AMMO_FX_BLACKPOWDER ) ) { + fx.emplace_back( + _( "This ammo has been loaded with matchhead powder, and will quickly " + "clog and rust most guns like blackpowder, but will also rarely cause the gun damage from pressure spikes." ) ); + } else if( ammo.ammo_effects.count( "BLACKPOWDER" ) && + parts->test( iteminfo_parts::AMMO_FX_BLACKPOWDER ) ) { fx.emplace_back( _( "This ammo has been loaded with blackpowder, and will quickly " "clog up most guns, and cause rust if the gun is not cleaned." ) ); diff --git a/src/ranged.cpp b/src/ranged.cpp index 61d134e615c72..00f1b8d4d1239 100644 --- a/src/ranged.cpp +++ b/src/ranged.cpp @@ -740,9 +740,9 @@ bool Character::handle_gun_damage( item &it ) } } // chance to damage gun due to high levels of dirt. Very unlikely, especially at lower levels and impossible below 5,000. Lower than the chance of a jam at the same levels. 555555... is an arbitrary number that I came up with after playing with the formula in excel. It makes sense at low, medium, and high levels of dirt. - if( dirt_dbl > 5000 && - x_in_y( dirt_dbl * dirt_dbl * dirt_dbl, - 5555555555555 ) ) { + // if you have a bullet loaded with match head powder this can happen randomly at any time. The chances are about the same as a recycled ammo jamming the gun + if( ( dirt_dbl > 5000 && x_in_y( dirt_dbl * dirt_dbl * dirt_dbl, 5555555555555 ) ) || + ( curammo_effects.count( "MATCHHEAD" ) && one_in( 256 ) ) ) { add_msg_player_or_npc( m_bad, _( "Your %s is damaged by the high pressure!" ), _( "'s %s is damaged by the high pressure!" ), it.tname() ); diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index 8011051fbf3d8..56a1c04294435 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -1754,6 +1754,7 @@ massproduced masterkey mastiffs matar +matchhead matryoshka mausketeer mausoleums