mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-01-29 17:56:21 +00:00
Merge branch 'top-left-ring-usage-buff' into 'master'
Ring Power added See merge request kart-krew-dev/ring-racers-internal!2614
This commit is contained in:
commit
403fec5eda
1 changed files with 4 additions and 3 deletions
|
|
@ -3737,8 +3737,9 @@ 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.
|
||||
// (We compensate when decrementing ringboost to avoid runaway exponential scaling hell.)
|
||||
fixed_t rb = FixedDiv(player->ringboost * FRACUNIT, max(FRACUNIT, K_RingDurationBoost(player)));
|
||||
fixed_t rp = ((9 - player->kartspeed) + (9 - player->kartweight)) * ((3*FRACUNIT/20)/16);
|
||||
ADDBOOST(
|
||||
ringboost_base + FixedMul(FRACUNIT / 1750, rb),
|
||||
ringboost_base + FixedMul(FRACUNIT / 1750, rb) + rp,
|
||||
4*FRACUNIT,
|
||||
Easing_InCubic(min(FRACUNIT, rb / (TICRATE*12)), 0, 2*HANDLESCALING/5)
|
||||
); // + 20% + ???% top speed, + 400% acceleration, +???% handling
|
||||
|
|
@ -11410,7 +11411,7 @@ static void K_UpdatePlayerWaypoints(player_t *const player)
|
|||
|
||||
INT32 K_GetKartRingPower(const player_t *player, boolean boosted)
|
||||
{
|
||||
fixed_t ringPower = ((9 - player->kartspeed) + (9 - player->kartweight)) * (FRACUNIT/2);
|
||||
fixed_t ringPower = ((9 - player->kartspeed) + (9 - player->kartweight)) * (FRACUNIT/4);
|
||||
|
||||
if (boosted == true)
|
||||
{
|
||||
|
|
@ -11422,7 +11423,7 @@ INT32 K_GetKartRingPower(const player_t *player, boolean boosted)
|
|||
|
||||
INT32 K_GetFullKartRingPower(const player_t *player, boolean boosted)
|
||||
{
|
||||
return 3 + K_GetKartRingPower(player, boosted);
|
||||
return 7 + K_GetKartRingPower(player, boosted);
|
||||
}
|
||||
|
||||
// Returns false if this player being placed here causes them to collide with any other player
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue