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

Fixes Naming of CZ 12-round Magazine, and Adjusts the Descriptions of Reloaded 5.7mm Ammunition #72653

Closed
wants to merge 44 commits into from

Conversation

DoctorBoomstick
Copy link
Contributor

Summary

None

Purpose of change

It was pointed out in the discord that there was trouble within the wonderful lands of our guns: an unrest unimagined, an error in the matrix, an anomaly in the force.
The CZ 12-round magazine has an ID that describes it as holding 12 rounds, and, in game, it does only hold 12 rounds. However, the name and description indicated that it holds 16 rounds.
The descriptions for reloaded 5.7x28mm ammo, whether black powder or normally reloaded, were rather strange, as unlike most other calibres, they provided no description for the effects that the reloading process has on the performance of the cartridge. In addition, labelling something as being loaded with an FMJ bullet while it explicitly lacks any FMJ characteristic is a tad misleading.

Describe the solution

Fixes these errors and returns peace and stability to the CDDA gun kingdom.

Describe alternatives you've considered

Closing my eyes and believing very, very hard that these issues don’t exist, that no issues exist, and that I am a pony free of these worries.

Testing

They’re simple string changes. If I manage to screw something up, I will proudly pin a medal to my mug.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Mar 27, 2024
@Hyperseeker
Copy link
Contributor

The reason the name of the magazine is different because during my research into CZ 75 mags, I'd discovered that 12-round magazines for the pistol were not at all common. I suggested, then, to make it a 16-rounder, which is far more common IRL. I'm thinking maybe @ANickelN forgot to adjust the capacity after renaming the mag. It should, by all accounts, be a 16-round mag, with the appropriate capacity, since it was modelled as such after the rework.

data/json/items/ammo/57.json Outdated Show resolved Hide resolved
data/json/items/ammo/57.json Outdated Show resolved Hide resolved
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A 5.7x28mm cartridge hand reloaded with a simple lead bullet rather than a factory penetrator load, retaining its low recoil but lacking its signature armor penetration characteristic. The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use. Although the project to replace 9x19mm Parabellum was effectively cancelled, the 5.7x28mm round has seen action in many conflicts.
  • A 5.7x28mm cartridge hand reloaded with black powder, leading to lower velocities, muzzle smoke, and a dirtier barrel if you shoot it. The round was designed by FN Herstal to replace the 9x19mm round in NATO use, and although the project to replace the 9mm Parabellum was effectively cancelled, the 5.7x28mm round has seen action in many conflicts. It has very low recoil but lacks its usual armor penetration due to using a simple lead bullet rather than a proper factory-made penetrator projectile.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@DoctorBoomstick
Copy link
Contributor Author

The reason the name of the magazine is different because during my research into CZ 75 mags, I'd discovered that 12-round magazines for the pistol were not at all common. I suggested, then, to make it a 16-rounder, which is far more common IRL. I'm thinking maybe @ANickelN forgot to adjust the capacity after renaming the mag. It should, by all accounts, be a 16-round mag, with the appropriate capacity, since it was modelled as such after the rework.

Thank you for bringing this to my attention. I must admit, I just followed what the ID told me. I’ll hammer out a quick migration to a 16-round magazine. I could always just change the name, description, and cartridge amount, but leaving the ID there makes me irritated.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 27, 2024
@github-actions github-actions bot added Items: Magazines Ammo holding items and objects. Spawn Creatures, items, vehicles, locations appearing on map Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves and removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 27, 2024
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there should be a comma after either "recoil" or "armor penetration" in the last sentence of the black powder reload description.

Copy link
Contributor

github-actions bot commented May 5, 2024

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label May 5, 2024
@github-actions github-actions bot closed this Jun 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Magazines Ammo holding items and objects. [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map stale Closed for lack of activity, but still valid.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants