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

Shotguns once again #74642

Merged
merged 5 commits into from
Jun 22, 2024
Merged

Shotguns once again #74642

merged 5 commits into from
Jun 22, 2024

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Jun 17, 2024

Summary

Content "Added two shotguns, streamlined another two"

Describe the solution

  • Add Standard Manufacturing DP-12 (very ridiculous gun)
  • Add SRM Arms Model 1216 (very cool, but no less ridiculous gun)
  • Change the way ts12 and ksg was made - two and three tube respectively were emulated by having a main gun that contain one tube, and second/third gun under the barrel that can also store ammo and be used. Sound cool for storing slugs in one barrel, while spending beanbags from another, unfortunately was either a hell to micromanage, or made you utilize only the single mag, removing the only benefit they have. Now instead of three guns in a trenchcoat it's just a single gun

Testing

Walked around, tested itemgroups, shoot some guns

Additional context

I sadly found that even with gunbroker account, the advanced search simply refuses to work for me, so this is only the lots that are currently sold at the gunbroker
Still should be plenty enough (also reminder that guns are not discontinued yet)
image
image

Migration works as expected
image

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Magazines Ammo holding items and objects. Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Code: Tests Measurement, self-control, statistics, balancing. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Aftershock Anything to do with the Aftershock mod Mods: Generic Guns Anything to do with Generic Guns Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) labels Jun 17, 2024
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jun 17, 2024
Copy link
Contributor

@DoctorBoomstick DoctorBoomstick left a comment

Choose a reason for hiding this comment

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

Doom Guy is nodding in approval.

data/json/items/gun/shot.json Outdated Show resolved Hide resolved
data/json/items/gun/shot.json Outdated Show resolved Hide resolved
data/json/items/gun/shot.json Outdated Show resolved Hide resolved
data/json/items/gun/shot.json Show resolved Hide resolved
data/json/items/gun/shot.json Outdated Show resolved Hide resolved
data/json/items/gun/shot.json Outdated Show resolved Hide resolved
data/json/items/gun/shot.json Outdated Show resolved Hide resolved
data/json/items/magazine/shot.json Outdated Show resolved Hide resolved
data/json/items/magazine/shot.json Outdated Show resolved Hide resolved
data/json/items/magazine/shot.json Outdated Show resolved Hide resolved
Co-authored-by: DoctorBoomstick <[email protected]>
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jun 18, 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 16-round rotary magazine for that strangest of beasts, the SRM Arms Model 1216 shotgun.
  • DP-12
  • DP-12s
  • SRM Arms Model 1216
  • SRM Arms Model 1216 16-round magazine
  • SRM Arms Model 1216 16-round magazines
  • SRM Arms Model 1216s

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.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 19, 2024
@Maleclypse Maleclypse merged commit 5750b86 into CleverRaven:master Jun 22, 2024
24 checks passed
@GuardianDll GuardianDll deleted the shotguns branch June 22, 2024 06:15
@Holli-Git
Copy link
Contributor

Gotta say, thanks for adding the SRM! Such a goofy lil goober

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: Tests Measurement, self-control, statistics, balancing. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons Items: Magazines Ammo holding items and objects. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Generic Guns Anything to do with Generic Guns Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants