thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extended Insta-Whip punish window

Browse source
This commit is contained in:
Antonio Martinez 2025-08-24 03:35:15 -04:00
parent a191c5d394
commit bfda339538
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_collide.cpp
View file

@ -1054,6 +1054,10 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
attackerPlayer->roundconditions.checkthisframe = true;
}
// Remove extended whip recovery from the attacker
if (attackerPlayer->defenseLockout > PUNISHWINDOW)
attackerPlayer->defenseLockout -= PUNISHWINDOW;
return true;
}
return false;

4
src/k_kart.c
View file

@ -14281,7 +14281,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
// which is allowed during painstate as a last-ditch defensive option.
if (player && player->mo && player->mo->health > 0 && !player->spectator && !mapreset && leveltime > introtime)
{
boolean chargingwhip = (cmd->buttons & BT_ATTACK) && (player->rings <= 0) && (!player->instaWhipChargeLockout) && (!player->itemRoulette.active);
boolean chargingwhip = (cmd->buttons & BT_ATTACK) && (player->rings <= 0) && (!player->instaWhipChargeLockout) && (player->defenseLockout <= PUNISHWINDOW) && (!player->itemRoulette.active);
boolean releasedwhip = (!(cmd->buttons & BT_ATTACK)) && (player->rings <= 0 && player->instaWhipCharge) && !(P_PlayerInPain(player));
if (K_PowerUpRemaining(player, POWERUP_BADGE))
@ -14357,7 +14357,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->instaWhipCharge = 0;
if (!K_PowerUpRemaining(player, POWERUP_BARRIER))
{
player->defenseLockout = PUNISHWINDOW;
player->defenseLockout = 2*PUNISHWINDOW;
}
S_StartSound(player->mo, sfx_iwhp);

7
src/p_enemy.c
View file

@ -3503,7 +3503,8 @@ void A_AttractChase(mobj_t *actor)
if (actor->extravalue1 && actor->type != MT_EMERALD) // SRB2Kart
{
if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player || actor->target->player->baildrop || actor->target->player->bailcharge)
if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player
|| actor->target->player->baildrop || actor->target->player->bailcharge || actor->target->player->defenseLockout > PUNISHWINDOW)
{
P_RemoveMobj(actor);
return;
@ -3526,7 +3527,7 @@ void A_AttractChase(mobj_t *actor)
if (actor->target->player->rings <= 10 && P_IsDisplayPlayer(actor->target->player))
{
S_ReducedVFXSoundAtVolume(actor->target, sfx_gshab,
S_ReducedVFXSoundAtVolume(actor->target, sfx_gshab,
210 - 10*actor->target->player->rings
, NULL);
@ -12212,7 +12213,7 @@ void A_BallhogExplode(mobj_t *actor)
mo2->color = actor->target->color;
mo2->colorized = true;
}
P_StartQuakeFromMobj(7, 50 * actor->scale, 1024 * actor->scale, actor);
actor->fuse = 1;

2
src/p_inter.c
View file

@ -731,7 +731,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (player->instaWhipCharge)
return;
if (player->baildrop || player->bailcharge)
if (player->baildrop || player->bailcharge || player->defenseLockout > PUNISHWINDOW)
return;
// Don't immediately pick up spilled rings