Skip to content

Don't stay scoped while playing bolt animation#1809

Merged
Agiel merged 1 commit intoNeotokyoRebuild:masterfrom
Agiel:no_bolting_while_scoped
Mar 10, 2026
Merged

Don't stay scoped while playing bolt animation#1809
Agiel merged 1 commit intoNeotokyoRebuild:masterfrom
Agiel:no_bolting_while_scoped

Conversation

@Agiel
Copy link
Contributor

@Agiel Agiel commented Mar 9, 2026

Description

We should probably move IsAllowedToZoom to NEOBaseCombatWeapon` and then override in the SRS class, but this is good enough for now. Basically just return false if weapon is SRS and we're playing the bolt animation.

Toolchain

  • Linux GCC Distro Native - CachyOS - gcc version 15.2.1 20260209

Linked Issues

@Agiel Agiel requested a review from a team March 9, 2026 21:00
@Agiel Agiel added the Tournament Priority Issues to be prioritized for the upcoming NT;RE tournament label Mar 9, 2026
@sunzenshen sunzenshen requested a review from a team March 10, 2026 08:08
@AdamTadeusz
Copy link
Contributor

AdamTadeusz commented Mar 10, 2026

this doesn't fix quickswitching away from and back to the srs allowing immediate scope in, maybe change -fixes to -related or whatever that keyword is, or open another issue?

@Agiel
Copy link
Contributor Author

Agiel commented Mar 10, 2026

this doesn't fix quickswitching away from and back to the srs allowing immediate scope in, maybe change -fixes to -related or whatever that keyword is, or open another issue?

I wasn't sure what rain (or was it you?) was referring to in that comment. I tried it in OGNT and the only delay I could see was the one that should be added by #1663.

@AdamTadeusz
Copy link
Contributor

fasterScopingWhenQuickSwitching.mp4

@AdamTadeusz
Copy link
Contributor

AdamTadeusz commented Mar 10, 2026

aha i see we're going for plugin quickswitching

disgusteeng

@Agiel
Copy link
Contributor Author

Agiel commented Mar 10, 2026

You're not quick switching properly, as you can tell by the bolt sound. You gotta switch while still holding the fire button. If you do you'll be able to scope immediately. That said, ognt probably has something like soonestScopeTime which is set when the bolt animation starts, while here I'm just looking at the current idea activity. Anyway, given that proper quick switching lets you zoom immediately, and that we have #1663, I think it's fine to close #1793 with this.

@Agiel Agiel merged commit bbb1bd9 into NeotokyoRebuild:master Mar 10, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Tournament Priority Issues to be prioritized for the upcoming NT;RE tournament

Projects

None yet

3 participants