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 'more-ring-box' into 'master'

Browse source 
Ring Box time 2->3s

See merge request KartKrew/Kart!1376
This commit is contained in:
Oni 2023-08-11 06:17:47 +00:00
commit bd08da2ae9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_kart.c
View file

@ -1901,7 +1901,7 @@ static void K_SpawnGenericSpeedLines(player_t *player, boolean top)
else if (player->ringboost) else if (player->ringboost)
{ {
UINT8 ringboostcolors[] = {SKINCOLOR_AQUAMARINE, SKINCOLOR_EMERALD, SKINCOLOR_GARDEN, SKINCOLOR_CROCODILE, SKINCOLOR_BANANA}; UINT8 ringboostcolors[] = {SKINCOLOR_AQUAMARINE, SKINCOLOR_EMERALD, SKINCOLOR_GARDEN, SKINCOLOR_CROCODILE, SKINCOLOR_BANANA};
UINT8 ringboostbreakpoint = min(player->ringboost / TICRATE / 3, sizeof(ringboostcolors) / sizeof(ringboostcolors[0])); UINT8 ringboostbreakpoint = min(player->ringboost / TICRATE / 6, sizeof(ringboostcolors) / sizeof(ringboostcolors[0]));
if (ringboostbreakpoint > 0) if (ringboostbreakpoint > 0)
{ {
fast->color = ringboostcolors[ringboostbreakpoint - 1]; fast->color = ringboostcolors[ringboostbreakpoint - 1];
@ -3288,7 +3288,7 @@ static void K_GetKartBoostPower(player_t *player)
{ {
// This one's a little special: we add extra top speed per tic of ringboost stored up, to allow for Ring Box to really rocket away. // This one's a little special: we add extra top speed per tic of ringboost stored up, to allow for Ring Box to really rocket away.
// (We compensate when decrementing ringboost to avoid runaway exponential scaling hell.) // (We compensate when decrementing ringboost to avoid runaway exponential scaling hell.)
ADDBOOST(FRACUNIT/4 + (FRACUNIT / 2000 * (player->ringboost)), 4*FRACUNIT, 0); // + 20% top speed, + 400% acceleration, +0% handling ADDBOOST(FRACUNIT/4 + (FRACUNIT / 1500 * (player->ringboost)), 4*FRACUNIT, 0); // + 20% top speed, + 400% acceleration, +0% handling
} }
if (player->eggmanexplode) // Ready-to-explode if (player->eggmanexplode) // Ready-to-explode

2
src/k_objects.h
View file

@ -137,7 +137,7 @@ void Obj_RandomItemVisuals(mobj_t *mobj);
boolean Obj_RandomItemSpawnIn(mobj_t *mobj); boolean Obj_RandomItemSpawnIn(mobj_t *mobj);
fixed_t Obj_RandomItemScale(fixed_t oldScale); fixed_t Obj_RandomItemScale(fixed_t oldScale);
void Obj_RandomItemSpawn(mobj_t *mobj); void Obj_RandomItemSpawn(mobj_t *mobj);
#define RINGBOX_TIME (70) #define RINGBOX_TIME (105)
/* Gachabom Rebound */ /* Gachabom Rebound */
void Obj_GachaBomReboundThink(mobj_t *mobj); void Obj_GachaBomReboundThink(mobj_t *mobj);