mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-22 02:00:11 +00:00
Merge branch 'fix-overshield-stacking-from-boosts' into 'master'
Cap overshield stacking from sneaker boosts Closes #1556 See merge request kart-krew-dev/ring-racers-internal!2607
This commit is contained in:
commit
5017cf1e52
1 changed files with 5 additions and 3 deletions
|
|
@ -7317,15 +7317,17 @@ void K_DoSneaker(player_t *player, INT32 type)
|
|||
{
|
||||
case 0: // Panel sneaker
|
||||
player->panelsneakertimer = sneakertime;
|
||||
player->overshield += 1;
|
||||
if (player->overshield > 0) {
|
||||
player->overshield = min( player->overshield + TICRATE/3, max( TICRATE, player->overshield ));
|
||||
}
|
||||
break;
|
||||
case 1: // Single item sneaker
|
||||
player->sneakertimer = sneakertime;
|
||||
player->overshield += TICRATE/2;
|
||||
player->overshield = max( player->overshield, 25 );
|
||||
break;
|
||||
case 2: // Rocket sneaker (aka. weaksneaker)
|
||||
player->weaksneakertimer = 3*sneakertime/4;
|
||||
player->overshield += TICRATE/2;
|
||||
player->overshield = max( player->overshield, TICRATE/2 );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue