Added crhook hook style #304
Conversation
There was a problem hiding this comment.
So I've tested this, and it all seems to work.
If you guys have tested it as well, and are OK with the speed - I'm cool with merging this. 👍
My only suggestion (besides the couple of inline comments left below) is that we no longer really need the hook_fast option - it was meant to be an option for people who didn't want to use the enhancements provided by the hook_smooth setting, but this hook is exactly the same (but faster).
My suggestion would be to removing the existing hook_fast implementation entirely, and renaming crhook to hook_fast. The crhook name honestly doesn't make sense, and this hook is faster than the existing fast hook anyways 😄
That way, we can also keep the hook options to 3, which feels slightly more reasonable than 4.
src/grapple.c
Outdated
| float throwSpeed = cvar("k_ctf_hookstyle") != 3 ? NEW_THROW_SPEED : THROW_SPEED; | ||
|
|
||
| if (cvar("k_ctf_hookstyle") == 4) throwSpeed = CR_THROW_SPEED; | ||
|
|
There was a problem hiding this comment.
might want to convert these to a series of if statements, keeping the ternary doesn't make a ton of sense anymore.
src/commands.c
Outdated
| @@ -882,6 +884,7 @@ cmd_t cmds[] = | |||
| { "hook_smooth", hooksmooth, 0, CF_PLAYER | CF_MATCHLESS, CD_HOOKSMOOTH }, | |||
| { "hook_fast", hookfast, 0, CF_PLAYER | CF_MATCHLESS, CD_HOOKFAST }, | |||
| { "hook_classic", hookclassic, 0, CF_PLAYER | CF_MATCHLESS, CD_HOOKCLASSIC }, | |||
| { "crhook", hookcrhook, 0, CF_PLAYER | CF_MATCHLESS, CD_HOOKCRHOOK }, | |||
There was a problem hiding this comment.
I know this was the original command for this hookstyle, but it makes it more difficult to find the various options if they're not following the same naming convention. Lets stick with the hook_ prefix for this as well.
|
@inf1niti |
|
@SpookyScaryDev, |
|
@tcsabina Will do. Hope to do testing of the different options with the ctf community this week. |
Hi @SpookyScaryDev, Let me know... |
|
Guys, Let me know... |
|
@SpookyScaryDev is on vacation until 11th. Hence no reply :) From CTF Admins point of view, we are good to merge if crhook is back like it used to be before it got removed with the values we requested. |
|
Thanks @cbirkeland! |
|
If the code is ok, this should be ready to push now. |
Thanks for the note. Merged... |
Added crhook hookstyle as described by @inf1niti in #303
At the moment, haste still affects throw speed when using crhook, as that was the original behaviour crhook was removed. I also changed the naming of the speed constants, since the speed for the new hook styles was called CR_THROW_SPEED.