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

Add more generic gun names #76019

Merged
merged 12 commits into from
Sep 5, 2024
Merged

Conversation

Holli-Git
Copy link
Contributor

Summary

Bugfixes "Adds some missing gun variants"

Purpose of change

There was some guns with missing gun variant names and descriptions so I decided to add some.

Describe the solution

Adds some, along with some more history behind the guns.

Describe alternatives you've considered

Not doing this

Testing

image
image

Additional context

Putting this as draft so I can have some feedback, and if I feel like adding more descriptions. Might knock out the black powder revolvers next

@Holli-Git Holli-Git marked this pull request as draft August 28, 2024 19:20
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [Python] Code made in Python Code: Tooling Tooling that is not part of the main game but is part of the repo. <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Aug 28, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 28, 2024
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 28, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 29, 2024
data/json/items/gun/38.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
  • 1874 Sharpses
  • A famous revolver for many westerns, the Colt Single Action Army has seen plenty of military service, production ends, and production restarts. While originally in a large amount of chamberings, it is mostly found in .45 Colt chamberings today. While reloading is slow due to the lack of a swing-out cylinder, it was still much faster than earlier revolvers of the time thanks to using metallic cartridges. It's also sometimes referred to as the Peacemaker, Model P, M1873 or shortened to SAA.
  • A powerful military rifle originally chambered in .30-03 Springfield, developed to replace the US Army's older Krag rifle. It was quickly rechambered into the .30-06 caliber with its spitzer bullet. While an American rifle produced and developed around WW1, manufacturing couldn't keep up with demand, and saw service alongside the M1917 Enfield, a British rifle rechambered for the American 30-06. It saw service as a sniper rifle up to the Vietnam War, but nowadays is mainly used by civilians, either as hunting rifles or in collections.
  • A very common 7.62x39 rifle, the SKS was designed to replace the Mosin Nagant bolt action rifle, while the AK-47 was meant to replace the PPSh-41. Mechanically, it resembles a much scaled down version of USSR's PTRS-41 semi automatic anti-tank rifle. However, due to the success of the AK-47, the SKS was replaced by it in the USSR's Red Army. It still saw service in other militaries, mainly other socialist states that got a surplus of SKS carbines from the USSR. Due to the amount produced, it is a commonplace rifle in many gun owning American households.
  • AKMs
  • Arguably the most mass-produced firearm ever made, the AKM has cemented itself in history, and a few country flags. Designed after WW2, it was meant to replace the PPSh-41's role, but soon became the main infantry rifle. While many believe it is a copy of the German StG-44, it more resembles an M1 Garand in operation. Despite it's age, it still sees plenty of use in conflicts today.
  • Browning BLRs
  • Century Arms Dracos
  • Century Arms Micro Dracos
  • Century Arms Mini Dracos
  • Century Arms NAK 9
  • Century Arms NAK 9s
  • Century Arms VSKA
  • Century Arms VSKAs
  • Century Arms WASR-10
  • Century Arms WASR-10s
  • Ruger LCRs
  • SKSs
  • The M1 Garand is a widely celebrated battle rifle, being one of the most mass-produced battle rifles in the world. It saw widespread use in the US military, being used extensively in WW2 and the Korean War. While its military use has dwindled down, being out of US service for more than 50 years, some of its mechanical influence still remains through rifles such as AKs or M14s. It still sees widespread use in civilian spaces as an accurate competition or hunting rifle.
  • This one is a VSKA, manufactured in the USA by Century Arms.
  • This one is a WASR-10, imported by Century Arms.
  • Uberti 1873 Cattlemans

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.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@Holli-Git Holli-Git marked this pull request as ready for review August 29, 2024 16:50
@Holli-Git Holli-Git removed the request for review from tenmillimaster September 1, 2024 16:14
@Maleclypse Maleclypse merged commit 73fbff0 into CleverRaven:master Sep 5, 2024
39 of 40 checks passed
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 BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Code: Tooling Tooling that is not part of the main game but is part of the repo. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Python] Code made in Python
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants