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

Merge branch 'eggmark-bail' into 'master'

Browse source 
No bailing Eggmark, 30% speed -> 45%

See merge request kart-krew-dev/ring-racers-internal!2957
This commit is contained in:
Gunla 2025-10-19 18:28:59 +00:00
commit 54e9534615
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/k_kart.c
View file

@ -3963,7 +3963,7 @@ static void K_GetKartBoostPower(player_t *player)
if (player->eggmanexplode) // Ready-to-explode
{
ADDBOOST(6*FRACUNIT/20, FRACUNIT, 0); // + 30% top speed, + 100% acceleration, +0% handling
ADDBOOST(9*FRACUNIT/20, FRACUNIT, 0); // + 45% top speed, + 100% acceleration, +0% handling
}
if (player->vortexBoost) // Holding wavedash vortex (assigned in K_UpdateWavedashIndicator!)
@ -10983,6 +10983,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
P_StartQuakeFromMobj(7, 50 * player->mo->scale, 2048 * player->mo->scale, player->mo);
player->bailhitlag = false;
/*
if (player->markedfordeath)
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_INSTAKILL);
*/
}
if ((!P_PlayerInPain(player) && player->bailcharge >= 5) || player->bailcharge >= BAIL_MAXCHARGE)
@ -10990,6 +10995,13 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
mobj_t *bail = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_BAIL);
P_SetTarget(&bail->target, player->mo);
if (player->itemRoulette.eggman || player->eggmanexplode)
{
player->markedfordeath = true;
player->eggmanexplode = 1;
player->rings = -20;
}
if (player->itemRoulette.active)
{
player->itemRoulette.active = false;