fix: prevent losing rocket punch cooldown after ultimate (for real this time (again)) - [merged]

[MaxwellJung]

In GitLab by @hikiru on Nov 10, 2023, 18:24

_Merges punch_cooldown_ultfix -> staging

Couldn't figure out the rebase issues on my last merge request so I made a new branch and copied my changes. I did more testing with this and didn't find any issues with any abilities being used after ult.

[MaxwellJung]

added 2 commits

• ef98bf6f - 1 commit from branch staging
• 8da781af - Fixed cooldown loss when using punch after ult

Compare with previous version

[MaxwellJung]

so what was the issue with !34?

[MaxwellJung]

In GitLab by @hikiru on Nov 11, 2023, 10:48

It didn't need to allow slam to be used, because that was already handled by slam rules. So until the player slammed again, slam wouldn't get disallowed. For some reason moving the cooldown set for punch caused this to become an issue when it wasn't before. I also had to move some stuff around and add some fixes to prevent slam from cancelling immediately if used after ult and to prevent the player from punching when using uppercut immediately after ult.

[MaxwellJung]

approved this merge request

[MaxwellJung]

mentioned in commit a8a6a14be9bce3ee9905771457e5c15675a26e7e

[MaxwellJung]

In GitLab by @ghost1 on Nov 12, 2023, 19:44

:tada: This MR is included in version 1.10.2 :tada:

The release is available on GitLab release.

Your semantic-release bot :package: :rocket: