From 841c6b9e76c422fd5a4b4dc905ceae2283778fd3 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 23 Aug 2022 19:28:07 -0400 Subject: [PATCH 1/5] Increase spindash power --- src/k_kart.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index d9c348513..1e82c5377 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2975,15 +2975,14 @@ INT16 K_GetSpindashChargeTime(player_t *player) fixed_t K_GetSpindashChargeSpeed(player_t *player) { // more speed for higher weight & speed - // Tails = +6.25%, Fang = +20.31%, Mighty = +20.31%, Metal = +25% + // Tails = +15.6%, Fang = +43.75%, Mighty = +43.75%, Metal = +53.13% // (can be higher than this value when overcharged) - const fixed_t val = (player->kartspeed + player->kartweight) * (FRACUNIT/32); + const fixed_t val = ((player->kartspeed + player->kartweight) + 1) * (FRACUNIT/32); // TODO: gametyperules return (gametype == GT_BATTLE) ? (4 * val) : val; } - // sets boostpower, speedboost, accelboost, and handleboost to whatever we need it to be static void K_GetKartBoostPower(player_t *player) { From fa69737a33cf8a8dd7feecf09c64b56d7b58e6a5 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 23 Aug 2022 19:49:24 -0400 Subject: [PATCH 2/5] Double first blood power --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 1e82c5377..4125069f5 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3067,7 +3067,7 @@ static void K_GetKartBoostPower(player_t *player) if (player->startboost) // Startup Boost { - ADDBOOST(FRACUNIT/2, 4*FRACUNIT, 0); // + 50% top speed, + 400% acceleration, +0% handling + ADDBOOST(FRACUNIT, 4*FRACUNIT, 0); // + 100% top speed, + 400% acceleration, +0% handling } if (player->driftboost) // Drift Boost From 7f8ac08ea45481ad5f5325dc7ce4afeef080533e Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 23 Aug 2022 19:56:37 -0400 Subject: [PATCH 3/5] Don't eat up first blood in the air Makes it useful on City Escape. The visual effect ends early in the air, but oh well. --- src/k_kart.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 4125069f5..4f3abe41f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7267,6 +7267,8 @@ static void K_LookForRings(mobj_t *pmo) */ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) { + const boolean onground = P_IsObjectOnGround(player->mo); + K_UpdateOffroad(player); K_UpdateDraft(player); K_UpdateEngineSounds(player); // Thanks, VAda! @@ -7538,8 +7540,10 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (player->strongdriftboost) player->strongdriftboost--; - if (player->startboost) + if (player->startboost > 0 && onground == true) + { player->startboost--; + } if (player->spindashboost) { From eeb00dac22912c9f6f6a58a45323140527894a5e Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 23 Aug 2022 22:29:12 -0400 Subject: [PATCH 4/5] Even bigger spindash speed --- src/k_kart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 4f3abe41f..93f0c0339 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2975,9 +2975,9 @@ INT16 K_GetSpindashChargeTime(player_t *player) fixed_t K_GetSpindashChargeSpeed(player_t *player) { // more speed for higher weight & speed - // Tails = +15.6%, Fang = +43.75%, Mighty = +43.75%, Metal = +53.13% + // Tails = +18.75%, Fang = +46.88%, Mighty = +46.88%, Metal = +56.25% // (can be higher than this value when overcharged) - const fixed_t val = ((player->kartspeed + player->kartweight) + 1) * (FRACUNIT/32); + const fixed_t val = ((player->kartspeed + player->kartweight) + 2) * (FRACUNIT/32); // TODO: gametyperules return (gametype == GT_BATTLE) ? (4 * val) : val; From 89367c809dcd93f964150b7b87b25decd5a23dcc Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 23 Aug 2022 23:12:24 -0400 Subject: [PATCH 5/5] Give first blood sliptiding --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index e7f4f9f15..74ad3e658 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3084,7 +3084,7 @@ static void K_GetKartBoostPower(player_t *player) if (player->startboost) // Startup Boost { - ADDBOOST(FRACUNIT, 4*FRACUNIT, 0); // + 100% top speed, + 400% acceleration, +0% handling + ADDBOOST(FRACUNIT, 4*FRACUNIT, sliptidehandling/2); // + 100% top speed, + 400% acceleration, +25% handling } if (player->driftboost) // Drift Boost