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

Gunmod test #76370

Merged
merged 23 commits into from
Sep 23, 2024
Merged

Gunmod test #76370

merged 23 commits into from
Sep 23, 2024

Conversation

reddragon7799
Copy link
Contributor

@reddragon7799 reddragon7799 commented Sep 12, 2024

Summary

Content "Added more gunmods"

Purpose of change

I like the current gunmod system, but I think it would benefit from having more options. I also found it strange that the Mauser C96 was added to the game but no mention was made of its combination stock/holster, which seems like just the kind of thing that a light-traveling survivor would appreciate; the Chinese soldiers of the warlord period certainly did!

Describe the solution

Added nine two new gunmods, along with crafting recipes for most one of them.

Describe alternatives you've considered

Not add them? I suppose I could have completely reworked the existing system, but that's a little outside of my wheelhouse

Testing

Checked to see if the items I added appeared in the debug menu and, when spawned in, functioned as expected. For those with crafting recipes, I also made sure they were craftable.

Additional context

This is really a small selection of the kind of stuff people put on/in their guns, but I wanted to keep the scope limited to the most common accessories not already in the game (although I'd love to add tactical picatinny cupholders eventually). Currently the utility of the mods that hold extra ammunition is somewhat limited because you can't see what's inside of them once they've been attached to the gun, but I have no idea how to fix that.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons Spawn Creatures, items, vehicles, locations appearing on map Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves new contributor labels Sep 12, 2024
somebody took all my commas
Could have sworn I fixed these
Copy link
Contributor

@TheShadowFerret TheShadowFerret left a comment

Choose a reason for hiding this comment

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

Currently the utility of the mods that hold extra ammunition is somewhat limited because you can't see what's inside of them once they've been attached to the gun, but I have no idea how to fix that.

This did kill the previous attempt( #70858) 🤔

data/json/items/gunmod/stock.json Outdated Show resolved Hide resolved
data/json/items/gunmod/stock.json Outdated Show resolved Hide resolved
data/json/items/gunmod/stock.json Outdated Show resolved Hide resolved
data/json/items/gunmod/stock.json Outdated Show resolved Hide resolved
data/json/items/gunmod/underbarrel.json Outdated Show resolved Hide resolved
@osuphobia
Copy link
Contributor

For the ammo carriers/ mag pouches, did you actually test whether you can reload your gun with ammo/magazine inside them?

@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 Sep 12, 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
  • buttstock ammunition clipss
  • buttstock ammunition loopss
  • speedload shotgun stock
  • speedload shotgun stocks

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.

@reddragon7799
Copy link
Contributor Author

For the ammo carriers/ mag pouches, did you actually test whether you can reload your gun with ammo/magazine inside them?

So, embarrassingly, I forgot to! The C96 stock works as intended though, and you can attach it to the pistol while the pistol is in the stock without having to manually take it out. I wasn't aware of the earlier attempt but it makes sense that I wasn't the first to think of this... I suppose we will have to wait for the code to let us add ammo loops and flashlight holders and whatnot. There are still some parts of the work I did that don't rely on storage gimmicks and I would like to see if I can get those in.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 13, 2024
data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json Outdated Show resolved Hide resolved
data/json/items/gunmod/underbarrel.json Outdated Show resolved Hide resolved
data/json/recipes/weapon/mods.json Outdated Show resolved Hide resolved
data/json/recipes/weapon/mods.json Show resolved Hide resolved
reddragon7799 and others added 4 commits September 13, 2024 00:44
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 13, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 14, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 16, 2024
@reddragon7799
Copy link
Contributor Author

Hello! Bumping this because I think it's ready to merge (all required checks passed).

@Maleclypse Maleclypse merged commit 0a77471 into CleverRaven:master Sep 23, 2024
19 of 24 checks passed
@reddragon7799 reddragon7799 deleted the gunmod_test branch September 26, 2024 21:50
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 Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions new contributor Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants