Merge branch 'insecticide' into 'master'

Immediately disable tether when holding completed Insta-Whip charge

See merge request kart-krew-dev/ring-racers-internal!2942
This commit is contained in:
Ashnal 2025-10-16 03:00:09 +00:00
commit 2fe37dc996

View file

@ -41,7 +41,7 @@ Make sure this matches the actual number of states
#define INSTAWHIP_RINGDRAINEVERY (TICRATE/2)
#define INSTAWHIP_HOLD_DELAY (TICRATE*2)
// MUST be longer or equal to INSTAWHIP_CHARGETIME.
#define INSTAWHIP_TETHERBLOCK (TICRATE*4)
#define INSTAWHIP_TETHERBLOCK (3*TICRATE/4)
#define PUNISHWINDOW (G_CompatLevel(0x0010) ? 7*TICRATE/10 : 10*TICRATE/10)
#define BAIL_MAXCHARGE (84) // tics to bail when in painstate nad in air, on ground is half, if you touch this, also update Obj_BailChargeThink synced animation logic