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

Get 8 seconds of invincibility instead of 10 from karma comeback

Browse source
This commit is contained in:
James R 2022-08-01 14:34:45 -07:00
parent eac2aea082
commit 6402ced5dc
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_kart.c
View file

@ -3807,7 +3807,7 @@ void K_HandleBumperChanges(player_t *player, UINT8 prevBumpers)
if (player->bumpers > 0 && prevBumpers == 0) if (player->bumpers > 0 && prevBumpers == 0)
{ {
K_DoInvincibility(player); K_DoInvincibility(player, 8 * TICRATE);
if (netgame) if (netgame)
{ {
@ -5743,7 +5743,7 @@ static void K_ThrowLandMine(player_t *player)
throwmo->movecount = 0; // above player throwmo->movecount = 0; // above player
} }
void K_DoInvincibility(player_t *player) void K_DoInvincibility(player_t *player, tic_t time)
{ {
if (!player->invincibilitytimer) if (!player->invincibilitytimer)
{ {
@ -5752,7 +5752,8 @@ void K_DoInvincibility(player_t *player)
overlay->destscale = player->mo->scale; overlay->destscale = player->mo->scale;
P_SetScale(overlay, player->mo->scale); P_SetScale(overlay, player->mo->scale);
} }
player->invincibilitytimer += itemtime+(2*TICRATE); // 10 seconds
player->invincibilitytimer += time;
if (P_IsLocalPlayer(player) == true) if (P_IsLocalPlayer(player) == true)
{ {
@ -9688,7 +9689,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
case KITEM_INVINCIBILITY: case KITEM_INVINCIBILITY:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) // Doesn't hold your item slot hostage normally, so you're free to waste it if you have multiple if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) // Doesn't hold your item slot hostage normally, so you're free to waste it if you have multiple
{ {
K_DoInvincibility(player); K_DoInvincibility(player, 10 * TICRATE);
K_PlayPowerGloatSound(player->mo); K_PlayPowerGloatSound(player->mo);
player->itemamount--; player->itemamount--;
} }

2
src/k_kart.h
View file

@ -92,7 +92,7 @@ mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing,
void K_PuntMine(mobj_t *mine, mobj_t *punter); void K_PuntMine(mobj_t *mine, mobj_t *punter);
void K_DoSneaker(player_t *player, INT32 type); void K_DoSneaker(player_t *player, INT32 type);
void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound); void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound);
void K_DoInvincibility(player_t *player); void K_DoInvincibility(player_t *player, tic_t time);
void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source); void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source);
void K_UpdateHnextList(player_t *player, boolean clean); void K_UpdateHnextList(player_t *player, boolean clean);
void K_DropHnextList(player_t *player, boolean keepshields); void K_DropHnextList(player_t *player, boolean keepshields);