thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-19 12:01:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Allow the digestion to "catch up" a bit if you suddenly get a huge burst of spheres (such as a spherebox).

Browse source 
* Refactor a little, since the previous code required casting and could penalise 40 spheres a bit TOO much if you would be pushed beyond it that tic.
This commit is contained in:
toaster 2022-03-06 22:44:42 +00:00
parent 5f3bf3e8a2
commit 672bf9631d
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/k_kart.c
View file

@ -7061,6 +7061,10 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
else if (player->rings < -20)
player->rings = -20;
if (player->spheres > 40)
player->spheres = 40;
// where's the < 0 check? see below the following block!
if ((gametyperules & GTR_BUMPERS) && (player->bumpers <= 0))
{
// Deplete 1 every tic when removed from the game.
@ -7069,33 +7073,45 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
}
else
{
INT16 spheredigestion = TICRATE; // Base rate of 1 every second when playing.
INT16 digestionpower = ((10 - player->kartspeed) + (10 - player->kartweight))-1; // 1 to 17
spheredigestion -= ((player->spheres*digestionpower)/20);
tic_t spheredigestion = TICRATE; // Base rate of 1 every second when playing.
tic_t digestionpower = ((10 - player->kartspeed) + (10 - player->kartweight))-1; // 1 to 17
if (spheredigestion < 1) // just in case
// currently 0-34
digestionpower = ((player->spheres*digestionpower)/20);
if (digestionpower >= spheredigestion)
{
spheredigestion = 1;
}
else
{
spheredigestion -= digestionpower;
}
if ((player->spheres > 0) && (player->spheredigestion > 0))
{
// If you got a massive boost in spheres, catch up digestion as necessary.
if (spheredigestion < player->spheredigestion)
{
player->spheredigestion = (spheredigestion + player->spheredigestion)/2;
}
player->spheredigestion--;
if (player->spheredigestion == 0)
{
player->spheres--;
player->spheredigestion = (tic_t)spheredigestion;
player->spheredigestion = spheredigestion;
}
}
else
{
player->spheredigestion = (tic_t)spheredigestion;
player->spheredigestion = spheredigestion;
}
}
if (player->spheres > 40)
player->spheres = 40;
else if (player->spheres < 0)
// where's the > 40 check? see above the previous block!
if (player->spheres < 0)
player->spheres = 0;
if (comeback == false || !(gametyperules & GTR_KARMA) || (player->pflags & PF_ELIMINATED))