mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 13:37:47 +03:00
1156acd2f4
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> So, as it stands before this PR, somebody could do a combo like, say, the judo throw, by ctrl-clicking and then instantly rightclicking, throwing somebody else to the ground within the blink of an eye. With this PR, that shouldn't happen - grabbing follows the same rules as attacking (either punching or shoving), and uses the same cooldown. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Grabbing people puts your unarmed attacks on cooldown - [x] Unarmed attacking someone puts your grab on cooldown --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/22d4eadb-2ec1-4e6c-9ad3-dbdd36c6f3cd </p> </details> --- <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 - tweak: grabbing somebody mid-combo now obeys the same laws as every other attack, so no more instant judo throws --------- Co-authored-by: VMSolidus <evilexecutive@gmail.com>