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.

Sign up for GitHub

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

Removed descriptions for reloaded and black powder rounds #75874

Merged
merged 3 commits into from
Sep 24, 2024
Merged

Removed descriptions for reloaded and black powder rounds #75874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2354cb3
Remove ammo desc
Uwuewsky Aug 22, 2024
3cfb3c4
Ammo fix
Uwuewsky Aug 22, 2024
1485fae
Change effect desc
Uwuewsky Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions data/json/items/ammo/10mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"copy-from": "10mm_fmj",
"type": "AMMO",
"name": { "str_sp": "10mm Auto FMJ, black 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. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
Expand All @@ -94,7 +93,6 @@
"copy-from": "10mm_fmj",
"type": "AMMO",
"name": { "str_sp": "10mm Auto FMJ, reloaded" },
"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 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand All @@ -105,7 +103,6 @@
"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" ] }
Expand All @@ -115,7 +112,6 @@
"copy-from": "10mm_jhp",
"type": "AMMO",
"name": { "str_sp": "10mm Auto JHP, black powder" },
"description": "Jacketed 10mm Auto ammunition with a 180gr hollow point bullet, intended for use in self-defense, or perhaps hunting. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
Expand All @@ -130,28 +126,24 @@
"copy-from": "10mm_jhp",
"type": "AMMO",
"name": { "str_sp": "10mm Auto JHP, reloaded" },
"description": "Jacketed 10mm Auto ammunition with a 180gr hollow point bullet, intended for use in self-defense, or perhaps hunting. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
"id": "matchhead_10mm_jhp",
"copy-from": "10mm_jhp",
"copy-from": "bp_10mm_jhp",
"type": "AMMO",
"//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder",
"name": { "str_sp": "10mm Auto JHP, matchhead powder" },
"description": "Jacketed 10mm Auto ammunition with a 180gr hollow point bullet, intended for use in self-defense, or perhaps hunting. 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_jhp",
"extend": { "effects": [ "MATCHHEAD" ] }
},
{
"id": "reloaded_10mmP",
"copy-from": "10mmP",
"type": "AMMO",
"name": { "str_sp": "10mm Auto +P, reloaded" },
"description": "'Full House' 10mm Auto ammunition with a 140gr solid copper penetrator projectile, hunting of or self-defense from dangerous game. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand Down
6 changes: 0 additions & 6 deletions data/json/items/ammo/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"copy-from": "22_fmj",
"type": "AMMO",
"name": { "str_sp": ".22 LR FMJ, black powder" },
"description": ".22 Long Rifle ammunition with a 30gr FMJ bullet. The .22LR round is extremely weak, with short range and negligible recoil. This type is marginally better at piercing through targets, but deals even less damage as a result. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
Expand All @@ -85,7 +84,6 @@
"copy-from": "22_lr",
"type": "AMMO",
"name": { "str_sp": ".22 LR, black powder" },
"description": ".22 Long Rifle ammunition with a 40gr unjacketed bullet. The .22LR round is extremely weak, with short range and negligible recoil. It is most useful for target practice and hunting small animals. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
Expand All @@ -100,7 +98,6 @@
"copy-from": "22_lr",
"type": "AMMO",
"name": { "str_sp": ".22 LR, reloaded" },
"description": ".22 Long Rifle ammunition with a 40gr unjacketed bullet. The .22LR round is extremely weak, with short range and negligible recoil. It is most useful for target practice and hunting small animals. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand All @@ -110,7 +107,6 @@
"copy-from": "22_fmj",
"type": "AMMO",
"name": { "str_sp": ".22 FMJ, reloaded" },
"description": ".22 Long Rifle ammunition with a 30gr FMJ bullet. The .22LR round is extremely weak, with short range and negligible recoil. This type is marginally better at piercing through targets, but deals even less damage as a result. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand All @@ -121,7 +117,6 @@
"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" ] }
Expand All @@ -132,7 +127,6 @@
"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" ] }
Expand Down
6 changes: 0 additions & 6 deletions data/json/items/ammo/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
"copy-from": "223",
"type": "AMMO",
"name": { "str_sp": ".223 Remington, black powder" },
"description": ".223 Remington ammunition with a 55gr bullet, patterned after the M193 loading. The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
Expand All @@ -158,7 +157,6 @@
"copy-from": "556",
"type": "AMMO",
"name": { "str_sp": "5.56 NATO, black powder" },
"description": "5.56x45mm ammunition with a 62gr FMJ bullet. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
Expand All @@ -173,7 +171,6 @@
"copy-from": "556_incendiary",
"type": "AMMO",
"name": { "str_sp": "5.56 NATO tracer, black powder" },
"description": "An M856 tracer round. Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target. Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
Expand All @@ -188,7 +185,6 @@
"copy-from": "223",
"type": "AMMO",
"name": { "str_sp": ".223 Remington, reloaded" },
"description": ".223 Remington ammunition with a 55gr bullet, patterned after the M193 loading. The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand All @@ -198,7 +194,6 @@
"copy-from": "556",
"type": "AMMO",
"name": { "str_sp": "5.56 NATO, reloaded" },
"description": "5.56x45mm ammunition with a 62gr 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 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand All @@ -208,7 +203,6 @@
"copy-from": "556_incendiary",
"type": "AMMO",
"name": { "str_sp": "5.56 NATO tracer, reloaded" },
"description": "An M856 tracer round. Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand Down
5 changes: 1 addition & 4 deletions data/json/items/ammo/270win.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"abstract": "270win_fmj",
"type": "AMMO",
"name": { "str_sp": ".270 Winchester abstract" },
"description": ".270 Winchester ammunition with a 130gr full metal jacket bullet. It is a powerful round capable of taking down large targets with ease.",
"//": "This is .270 FMJ. 270 win is so exclusively used for hunting that FMJ ammo basically doesn't exist. This is just here for the BBTI data.",
"ascii_picture": "270win_jsp",
"longest_side": "85 mm",
Expand Down Expand Up @@ -100,7 +101,6 @@
"copy-from": "270win_jsp",
"type": "AMMO",
"name": { "str_sp": ".270 Winchester JSP, black powder" },
"description": ".270 Winchester ammunition with a 130gr soft point bullet. It is a powerful round capable of taking down large targets with ease, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 },
Expand All @@ -115,7 +115,6 @@
"copy-from": "270win_jsp",
"type": "AMMO",
"name": { "str_sp": ".270 Winchester JSP, reloaded" },
"description": ".270 Winchester ammunition with a 130gr soft point bullet. It is a powerful round capable of taking down large targets with ease. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand All @@ -125,7 +124,6 @@
"copy-from": "270win_fmj",
"type": "AMMO",
"name": { "str_sp": ".270 Winchester FMJ, reloaded" },
"description": ".270 Winchester ammunition with a 130gr full metal jacket bullet. It is a powerful round capable of taking down large targets with ease. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand All @@ -135,7 +133,6 @@
"copy-from": "reloaded_270win_fmj",
"type": "AMMO",
"name": { "str_sp": ".270 Winchester FMJ, black powder" },
"description": ".270 Winchester ammunition with a 130gr full metal jacket bullet. It is a powerful round capable of taking down large targets with ease, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/ammo/300.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
"copy-from": "300_winmag",
"type": "AMMO",
"name": { "str_sp": ".300 Winchester Magnum, black powder" },
"description": ".300 Winchester Magnum ammunition with a 220gr JHP bullet. The 300WM round is an extremely powerful and accurate rifle round, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder. Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
Expand All @@ -99,7 +98,6 @@
"copy-from": "300_winmag",
"type": "AMMO",
"name": { "str_sp": ".300 Winchester Magnum, reloaded" },
"description": "A .300 Winchester Magnum round, an extremely versatile cartridge that has been adopted by many shooting disciplines, finding use with hunters, military units, and law enforcement departments. 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 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
Expand Down
Loading
Loading