From a8ea3f22668d94db90cc1e7f691427bfd55f470e Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sat, 21 Jun 2025 01:10:01 -0400 Subject: [PATCH] Increase bubble scam radius, refactor --- src/k_kart.c | 2 +- src/k_kart.h | 2 ++ src/objects/bubble-shield.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index f442b9d38..5b2bc0ef5 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10083,7 +10083,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) } else { - fixed_t scam = K_PlayerScamPercentage(player, 2); + fixed_t scam = K_PlayerScamPercentage(player, BUBBLESCAM); fixed_t speed = R_PointToDist2(0, 0, player->mo->momx, player->mo->momy); fixed_t basespeed = K_GetKartSpeed(player, false, false); diff --git a/src/k_kart.h b/src/k_kart.h index 0ad2ca587..ff269dbb9 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -91,6 +91,8 @@ Make sure this matches the actual number of states #define MAXTOPACCEL (12*FRACUNIT) #define TOPACCELREGEN (FRACUNIT/16) +#define BUBBLESCAM (4) + // Handling boosts and sliptide conditions got weird. // You must be under a handling boost of at least SLIPTIDEHANDLING to sliptide. // HANDLESCALING is used to adjust all handling boosts simultaneously (weight factors in the future?) diff --git a/src/objects/bubble-shield.cpp b/src/objects/bubble-shield.cpp index 10ca907ab..d9c78fad7 100644 --- a/src/objects/bubble-shield.cpp +++ b/src/objects/bubble-shield.cpp @@ -120,7 +120,7 @@ struct Visual : Mobj renderflags &= ~(RF_TRANSMASK|RF_DONTDRAW); renderflags |= RF_ADD; - fixed_t transpercent = K_PlayerScamPercentage(bubble()->follow()->player, 2); + fixed_t transpercent = K_PlayerScamPercentage(bubble()->follow()->player, BUBBLESCAM); UINT8 transfactor = (transpercent * NUMTRANSMAPS) / FRACUNIT; if (transfactor < 10)