From 58ff9f75e9b1d00528a62162a84aec100a648a30 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Thu, 11 Jan 2024 21:32:12 -0700 Subject: [PATCH] In Battle, gain spheres for tricks instead of rings --- src/k_kart.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 1c1bc19d7..cc1729e3c 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -8601,6 +8601,8 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) player->trickcharge--; if (player->drift) player->trickcharge = max(player->trickcharge, 1); + if (gametyperules & GTR_SPHERES && (leveltime % 10 == 0)) + player->spheres++; } if (player->infinitether > 0) @@ -12823,9 +12825,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground) UINT8 award = TICRATE - player->trickboostdecay; player->trickboost = award; - K_AwardPlayerRings(player, - (TICRATE-player->trickboostdecay) * player->lastairtime/3 / TICRATE, // Scale ring award by same amount as trickboost - true); + if (!(gametyperules & GTR_SPHERES)) + K_AwardPlayerRings(player, + (TICRATE-player->trickboostdecay) * player->lastairtime/3 / TICRATE, // Scale ring award by same amount as trickboost + true); if (player->trickpanel == TRICKSTATE_FORWARD) player->trickboostpower /= 18;