Skip to content

Make it possible to fire the supa immediately after loading a shell#1681

Merged
Agiel merged 1 commit intoNeotokyoRebuild:masterfrom
Agiel:supa_reload_cancel
Feb 14, 2026
Merged

Make it possible to fire the supa immediately after loading a shell#1681
Agiel merged 1 commit intoNeotokyoRebuild:masterfrom
Agiel:supa_reload_cancel

Conversation

@Agiel
Copy link
Contributor

@Agiel Agiel commented Feb 14, 2026

Description

I didn't actually time this to make sure it's parity but it feels a lot closer. Basically, I only bump nextAttack when starting the reload and not for all the sequences after. A new member m_flNextReload was added to handle the delay between each shell because it was using nextAttack before.

I left the attack delay code commented out in case we want to revisit it later.

Toolchain

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

Linked Issues

@Agiel Agiel requested a review from a team February 14, 2026 11:47
@DESTROYGIRL DESTROYGIRL added the Gunplay Gunplay elements in Neotokyo. Grenades, TTK, etc. label Feb 14, 2026
@Agiel Agiel added the Tournament Priority Issues to be prioritized for the upcoming NT;RE tournament label Feb 14, 2026
@Rainyan Rainyan requested a review from a team February 14, 2026 18:05
Copy link
Contributor

@sunzenshen sunzenshen left a comment

Choose a reason for hiding this comment

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

LGTM:

supa-cancel-animation-load-followthrough.mp4

Also here is some footage of the before behavior, checking that I understand how it feels when the animation cannot be cancelled on master branch:

supa-before-cannot-animation-load-followthrough.mp4

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

Labels

Gunplay Gunplay elements in Neotokyo. Grenades, TTK, etc. Tournament Priority Issues to be prioritized for the upcoming NT;RE tournament

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Supa reload animation should be cancellable

4 participants