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

Gun mods + spawns #76416

Open
wants to merge 24 commits into
base: master
Choose a base branch
from

Conversation

Seb-The-SamMarten
Copy link
Contributor

Summary

Content "2 new gunmods + added to spawn pool"

Purpose of change

To help broaden the selection of gunmods, since there's not that many. (Especially for some specific slots, but those will come later. Maybe.)

Describe the solution

Added 2 mods.
"Big Brass Catcher"; Twice the size, twice the capacity, made of canvas instead of cotton.
"Offset Grip"; An angled grip for use on the side rail slot, giving the option of a forward grip to guns with integrated bipods, or who otherwise have no underbarrel.

Describe alternatives you've considered

None, as it's new content.

Testing

Trial and error, and help from the #mod-development channel on Discord. (Special thanks to GuardianDll and Holli.)

Additional context

Any values within are more than subject to feedback and change. This is my first go at this, so all of my numbers are guesstimations based on other things that already existed.

Added "offset_ggrip" to rail.json
Added "big_brass_catcher" to brass_catcher.json
Added "big_brass_catcher" and "offset_grip" to "item_group" "gunmod_common" in gunmod.json
@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 13, 2024
@Seb-The-SamMarten Seb-The-SamMarten marked this pull request as ready for review September 13, 2024 23:11
data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json Outdated Show resolved Hide resolved
data/json/items/gunmod/rail.json Outdated Show resolved Hide resolved
Reduced rarity of angled grip further, as suggested by Holli
Reduced aimspeed of offset_grip a tad, and added blacklist of other grip mods to prevent having an underbarrel grip and a side rail grip.
Added the 2 points I took from the aimspeed to the handling modifier (Forgot to do this with the first change, whoops)
Copy link
Contributor Author

@Seb-The-SamMarten Seb-The-SamMarten left a comment

Choose a reason for hiding this comment

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

Numbers tweaked based on feedback, and blacklists for other grip mods added to prevent nonsensical grip-stacking.

@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 14, 2024
Fixing errors the automatic tests caught.
Misunderstood the spaces error. Hopefully now fixed.
Hopefully fixed spacing issues in the description.
Copy link
Contributor Author

@Seb-The-SamMarten Seb-The-SamMarten left a comment

Choose a reason for hiding this comment

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

Some more fixes for code/spacing errors the bot caught. Whoops.

Linted the offset_rail code, since the bot seemed to have an issue with it.
Copy link
Contributor Author

@Seb-The-SamMarten Seb-The-SamMarten left a comment

Choose a reason for hiding this comment

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

Linted the offset_rail code since the bot had an issue with it.

Committing bot suggestion.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@SirPendrak
Copy link
Contributor

Shouldnt the blacklist include other underbarrel grips, instead of "main-hand" grips, near the trigger?

So, "grip", "grip_mod", "wooden_grip", "modern_handguard".
I have no idea about "bipod_handguard" and "bipod_handguard_deployed"

@Seb-The-SamMarten
Copy link
Contributor Author

Seb-The-SamMarten commented Sep 14, 2024 via email

Fixed the blacklist to actually include underbarrel front grips/weapons rather than the rear grips like I had done before. (Like a dingus.)
Copy link
Contributor Author

@Seb-The-SamMarten Seb-The-SamMarten left a comment

Choose a reason for hiding this comment

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

Underbarrel gunmod blacklist now populated with the correct mods.

Commiting bot suggestion.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 15, 2024
@SirPendrak
Copy link
Contributor

There is still "robofac_handguard" strangely located in robofac_gun.json

There is still case of "bipod_handguard" and "bipod_handguard_deployed". The first one has +4 handling, so you could get +8 with this new angled grip. In theory it could still work with "bipod_handguard_deployed" and have only colapsed version in blacklist, but I am not sure if it could cause some problems when trying to transform attached gunmod when one version is blacklisted. Probably best to blacklist both variants, they get good handling anyway, and if you want best handling with and without using bipod, you can just use standard bipod + the new angled grip.

I see the new grip has "aim_speed_modifier". Does it work on mod that is not a sight? It makes all sights aim faster?
If it works, then why only this kind of grip increases aiming speed?

@Seb-The-SamMarten
Copy link
Contributor Author

Seb-The-SamMarten commented Sep 15, 2024

@SirPendrak

It's intended to be used with bipods, so there's no reason to have them blacklisted. The whole point of making it was to give the guns forced to have bipods the option of a forward grip. :P (Unless I am reading the description of those bipods wrong and they are acting as a forward grip when not deployed?)

I didn't even know the "robofac_handguard" existed honestly. But if it's something that has a bipod or restricts the use of the underbarrel for some reason, then it would also be a candidate for being allowed. I'd have to look more into it.

As for when the bipod is actually deployed... hmm... I'm not 100% sure actually. Is there a way to make the bonuses from a part situational? Like, remove the bonus of the grip when the Bipod is deployed? That would probably be the best course if that is something that can be done. If not then... well, not that many guns use bipods, and the ones that do tend to have very poor handling anyway. An extra 4 points of dispersion isn't going to be an enormous, game-breaking boon. xD (Could potentially change the values of the 'deployed' versions of bipods to reduce their factors by 4, but then that would basically require the grip to be installed to make the difference.)

As for why this grip increases aim speed, it's purely because moving your point of contact more horizontal would allow you to turn the gun easier without having to turn your whole body like a standard vertical grip. I kept the number low (and even lowered it more) because it's not going to be an enormous difference, but the difference would still be there.

@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 16, 2024
Removed aimspeed altogether from offset_grip, pruned description.
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 17, 2024
Added "robofac_handguard" to the blacklist for "offset_grip" as it was confirmed that it is, in fact, an integrated forward grip and we don't want any grip stacking shenanigans.
Adding necessary files to ensure that mods stay properly blacklisted between each other; we don't want grip-stacking nonsense.
Added it in the wrong way.
Properly adding a necessary file to ensure that the grip mods are consistently blacklisted between each other.
@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Sep 21, 2024
Committing bot suggestino

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 21, 2024
Copy link
Contributor Author

@Seb-The-SamMarten Seb-The-SamMarten left a comment

Choose a reason for hiding this comment

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

Should hopefully be the last change necessary before this can be properly merged. The big brass catcher will remain without a recipe for now.

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.

4 participants