Clean up whip/guard timing defs

This commit is contained in:
AJ Martinez 2023-10-13 03:19:24 -07:00
parent 8fced1890b
commit 85641036ea
2 changed files with 1 additions and 4 deletions

View file

@ -3691,8 +3691,7 @@ void K_DoGuardBreak(mobj_t *t1, mobj_t *t2) {
if (P_PlayerInPain(t2->player))
return;
// short-circuit instashield for vfx visibility
t1->player->instaWhipCharge = GUARDBREAK_COOLDOWN;
t1->player->instaWhipCharge = 0;
t1->player->guardCooldown = GUARDBREAK_COOLDOWN;
S_StartSound(t1, sfx_gbrk);

View file

@ -31,8 +31,6 @@ Make sure this matches the actual number of states
#define INSTAWHIP_DURATION (12)
#define INSTAWHIP_COOLDOWN (5*TICRATE/4)
#define INSTAWHIP_STARTOFRACE (255)
#define INSTAWHIP_STARTOFBATTLE (1)
#define INSTAWHIP_DROPGUARD (12)
#define GUARDBREAK_COOLDOWN (TICRATE*4)