incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add grandprixinfo.gp checks I forgot about

Browse source
This commit is contained in:
yamamama 2025-12-29 10:40:59 -05:00
parent bcd446709c
commit 4fe0dff858
5 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -8496,7 +8496,7 @@ static void KartBumpSpark_OnChange(void)
return;
}
if (grandprixinfo.lunaticmode)
if ((grandprixinfo.gp == true) && (grandprixinfo.lunaticmode))
{
CONS_Printf("No, no - lunatics don't need Bump Spark!\n");
bumpsparkactive = 0;

20
src/k_bot.cpp
View file

@ -579,7 +579,7 @@ fixed_t K_BotMapModifier(void)
//return 5*FRACUNIT/10;
// ...with a bit of customization
if (grandprixinfo.lunaticmode == true)
if ((grandprixinfo.gp == true) && (grandprixinfo.lunaticmode == true))
return std::max(static_cast<fixed_t>(BASELUNATICSPEEDMOD), K_TrackModifierMax());
return K_TrackModifierMax();
@ -693,12 +693,18 @@ fixed_t K_BotRubberband(const player_t *player)
);
// +/- x0.35
const fixed_t rubberStretchiness =
FixedMul(FixedDiv(35 * FRACUNIT / 100, K_GetKartGameSpeedScalar(gamespeed)),
((grandprixinfo.lunaticmode == true) && (player->botvars.rival == true))
? std::max(BASELUNATICRIVALSPEEDMOD,
K_BotMapModifier()) // The rival is faster on Lunatic mode.
: K_BotMapModifier());
fixed_t botModifier = K_BotMapModifier();
if ((grandprixinfo.gp == true) && (grandprixinfo.lunaticmode == true))
{
if (player->botvars.rival == true)
botModifier =
std::max(BASELUNATICRIVALSPEEDMOD,
K_BotMapModifier()); // The rival is faster on Lunatic mode.
}
const fixed_t rubberStretchiness = FixedMul(
FixedDiv(35 * FRACUNIT / 100, K_GetKartGameSpeedScalar(gamespeed)), botModifier);
// Lv. 1: x0.4 min
// Lv. MAX: x0.85 min

6
src/k_items.c
View file

@ -796,7 +796,7 @@ static INT32 GetItemOdds(kartroulette_t *roulette, kartresult_t *result, UINT8 *
// These odds get stronger as 1st's frontrun increases.
INT32 runner_distval = result->augcvar[aug_idx]->value;
if (grandprixinfo.lunaticmode == true)
if ((grandprixinfo.gp == true) && (grandprixinfo.lunaticmode == true))
{
// Lunatic Mode: Divide this distance by 2.25 for
// aggressive frontrun prevention.
@ -1567,7 +1567,7 @@ INT32 KO_AltInvinOdds(INT32 odds, const kartroulette_t *roulette, const kartresu
UINT32 cdist = roulette->clusterDist;
if (grandprixinfo.lunaticmode)
if ((grandprixinfo.gp == true) && (grandprixinfo.lunaticmode))
{
// I'm tired, boss.
cdist = (9 * cdist / 5);
@ -1605,7 +1605,7 @@ INT32 KO_SPBRaceOdds(INT32 odds, const kartroulette_t *roulette, const kartresul
UINT32 raceforce_pdis = roulette->pdis;
if (grandprixinfo.lunaticmode == true)
if ((grandprixinfo.gp == true) && (grandprixinfo.lunaticmode == true))
{
// Multiply by 2.25
raceforce_pdis = FixedMul(raceforce_pdis, 9 * FRACUNIT / 2);

2
src/k_kart.c
View file

@ -2534,7 +2534,7 @@ UINT16 K_GetInvincibilityTime(player_t *player)
UINT32 cdist = player->distancefromcluster;
if (grandprixinfo.lunaticmode)
if ((grandprixinfo.gp == true) && (grandprixinfo.lunaticmode))
{
// I'm tired, boss.
cdist = (9 * cdist / 5);

4
src/p_setup.c
View file

@ -8231,8 +8231,10 @@ static void P_InitLevelSettings(boolean reloadinggamestate)
itemlistactive = true;
// Lunatics don't need Bump Spark!
if (grandprixinfo.lunaticmode == false)
if ((grandprixinfo.gp == false) || (grandprixinfo.lunaticmode == false))
{
bumpsparkactive = (UINT8)cv_kartbumpspark.value;
}
antibumptime = (tic_t)cv_kartantibump.value * TICRATE;