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

More Gun Variants, Part Iv #74691

Merged
merged 57 commits into from
Jun 26, 2024
Merged

Conversation

DoctorBoomstick
Copy link
Contributor

@DoctorBoomstick DoctorBoomstick commented Jun 20, 2024

Summary

None

Purpose of change

Continues work left off in… #62074, over 10000 PRs ago. Wow, this was a long time coming.
We have a lot of guns. We have a variant system for non-gun-savvy people. We don’t have variants for all our guns. This is not a great state of being.

Describe the solution

I have added generic variants for all the firearms in .50-calibre, as well as their magazines. I have also tweeked some of the pre-existing descriptions, mainly to set some prose in the past tense to reflect the game setting, and edited the AS-50 description to make it more concise.

Describe alternatives you've considered

Adding variants for different guns.

Testing

Additional context

Consult, for prior installments of this effort, PRs:

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jun 20, 2024
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 mahoosive rifle of military pedigree, fitted with a telescopic gun scope peeking over its giant cocking mechanism and resting upon a bipod to control recoil from the equally big .50-calibre munitions it is designed for. Originally employed for detonating unexploded ordnance in combat conditions and defeating light vehicular and structural targets, in the post-Cataclysm it serves as an admirable conduit of kinetic energy to the biggest and baddest of the new world's critters.
  • Essentially a giant steel box with a long barrel peering from one end and dual spade grips mounted upon the other, this venerable machine gun design served the United States military since the First World War, mounted on everything from tanks to patrol boats to aircraft, and even tripod-mounted for stand-alone use. Part and parcel with its size and munition payload of .50-calibre ammo belts, however, is the fact that, to operate it, one must mount it upon suitable furniture, terrain features, or vehicles.
  • Pin-point accurate out to one and a half kilometres and cycling its .50-calibre feed from detachable, 10-round magazines, this combat sniper's weapon provides users with a comfortable window to engage targets at a distance. Its imposing bullets ensure that it is more than capable of delivering an adequate account of itself at such ranges.
  • Relatively trim as far as .50-calibre rifles go, this single-shot firearm was a reasonably affordable entry-level gun for civilians wishing to play with some very large, very punchy toys. Now, at the world's Armageddon, it would be wise to make that singular round-capacity count on some high-priority craniums.
  • Serving both anti-materiel and high-priority sniping roles in their service with various militaries, bolt-action rifles, such as this one, were known for their long ranges of engagement, recoil, and armour-defeating ordinance. Essentially a step below light cannonry, as far as shoulder-arms are concerned, this weapon's mix of power and accuracy meet hands to ensure that, before the cataclysm, one shot was synonymous with one very, very dead target.

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.

Copy link
Member

@anothersimulacrum anothersimulacrum left a comment

Choose a reason for hiding this comment

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

Can you also remove these guns from this list?

"m107a1",
"as50",
"tac50",
"bfg50",

@github-actions github-actions bot added 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. BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jun 20, 2024
Copy link
Member

@Maleclypse Maleclypse left a comment

Choose a reason for hiding this comment

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

Looks good. I made some looks like suggestions but it's your call. Let me know which way you decide and this is ready for merge.

data/json/items/gun/50.json Outdated Show resolved Hide resolved
data/json/items/gun/50.json Outdated Show resolved Hide resolved
data/json/items/gun/50.json Outdated Show resolved Hide resolved
data/json/items/gun/50.json Outdated Show resolved Hide resolved
@Maleclypse Maleclypse merged commit d495fff into CleverRaven:master Jun 26, 2024
24 of 25 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 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.

3 participants