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

[MIRROR] Assorted Ballistics Changes #1484

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Conversation

SierraHelper
Copy link
Collaborator

Оригинальный PR: Baystation12#34297

🆑 Karl Johansson
rscadd: You can see what's currently in the chamber of a gun on examine.
rscadd: You can load non-magazine weapons by booping them with an appropriate loader.
tweak: Opening the bolt on bolt-action weapons unloads anything inside, not just empties.
tweak: 5mmR weapons are more accurate at long range.
/:cl:

"More information?"

When examining any gun that uses the CYCLE_CASINGS casing handling method (revolvers, flare guns, double-barreled shotguns, etc.) or a pump-action shotgun or a bolt action rifle with a weapons expertise skill of experienced or higher will allow you to view the chamber of the weapon so you can tell the status of the round inside, such as whether it's spent or not. This is because all of these weapons (although most egregiously revolvers) count empty cartridges in their round count which, while it does make sense and could even be considered realistic, can make using them harder. It also means that you can actually know what's going on inside your gun without having to code dive to find out how exactly it works.

The next change is another quality of life change. It's been generalized a lot to allow for expansion later (still not certain about going all in on replacing shotholders with handfuls of rounds), but currently it serves to allow pump-action shotguns to be loaded by clicking on it with a shotgun shell holder in hand, rather than having to manually go back and forth between the two items. There's still a small cooldown when doing this so that you can't just spam shells into your shotgun.

The bolt action weapon changes are mostly to resolve a pet peeve of mine, although they do mean that now all guns are capable of ejecting loaded ammo, whereas before bolt action weapons were uniquely unable to do this. I also think it makes their operation more immersive and makes the decision of reloading them slightly more impactful.

The 5mmR cartridge has been changed to be as accurate as the 7mmR cartridge on the grounds that I felt that the nerf was somewhat arbitrary and I wasn't satisfied with the explanation I was given as to why they were nerfed, since there are 3 different sniper weapons that use the calibre.

Spellcheck's a spellcheck. "it's" is a contraction of "it is". "its" is the possessive form of "it".

"Is there bugs?"

I hope not. I've tested this to the best of my abilities and I believe I've resolved everything. Unfortunately I am also me, so there might still be oversights. On the bright side, I never saw any runtimes. If this merge conflicts with something else, I'll probably just remove the part that is conflicting and try and add it again later, if that's allowed.

"My eyes are bleeding."

I've done my best to lay things out in a roughly coherent manner, although I'm not particularly well-versed in good coding practices. I'm completely open to redoing this from the ground up if it's required.

"I don't agree with these changes."

I will remove changes that are deemed unnecessary or break contribution guidelines if it is requested.

@SierraHelper SierraHelper requested a review from a team as a code owner November 20, 2023 12:22
@SierraHelper SierraHelper added 🪞 MIR ЯОЯ 📜 CL валиден Ченджлог не содержит ошибок labels Nov 20, 2023
@SuhEugene SuhEugene merged commit 3fd2457 into dev-sierra Nov 23, 2023
13 checks passed
@SuhEugene SuhEugene deleted the upstream-pr-34297 branch November 23, 2023 09:30
SierraHelper added a commit that referenced this pull request Nov 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🪞 MIR ЯОЯ 📜 CL валиден Ченджлог не содержит ошибок
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants