Update hashes, bot tweaks, fix thwompsactive

This commit is contained in:
GenericHeroGuy 2025-08-06 01:29:19 +02:00
parent 02590d30d9
commit 8a895d4813
4 changed files with 9 additions and 10 deletions

View file

@ -86,8 +86,8 @@
#define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291
#define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b
#define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9
#define ASSET_HASH_MAIN_PK3 0x8d9f63092051200b
#define ASSET_HASH_MAPPATCH_PK3 0x8d5303404c519b2e
#define ASSET_HASH_MAIN_PK3 0xf713c1778319b856
#define ASSET_HASH_MAPPATCH_PK3 0xced9ac5d605e3308
#define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461
#ifdef USE_PATCH_FILE
#define ASSET_HASH_PATCH_PK3 0x0000000000000000

View file

@ -1077,7 +1077,7 @@ void K_BotSetDriftState(player_t *player, botdrift_t newstate, tic_t lockout)
player->botvars.drifttime = 0;
}
if (lockout)
if (lockout > player->botvars.driftlockout)
player->botvars.driftlockout = lockout;
}
@ -1109,7 +1109,7 @@ static void K_BotStartDrift(player_t* player)
return;
}
if (speedfactor > (6-gamespeed)*FRACUNIT/3)
if (speedfactor > 5*FRACUNIT/4)
{
// likewise, don't bother if we're going too fast
K_BotSetDriftState(player, DRIFTSTATE_AUTO, BOTDRIFTLOCKOUT/2);

View file

@ -3715,7 +3715,7 @@ static void P_BouncePlayerMove(mobj_t *mo, TryMoveResult_t *result)
}
// Regardless of bumpspark, tell bots to stop drifting if they bonk a wall.
K_BotSetDriftState(mo->player, DRIFTSTATE_AUTO, BOTDRIFTLOCKOUT);
K_BotSetDriftState(mo->player, DRIFTSTATE_AUTO, TICRATE);
if (!cv_kartbumpspring.value || modeattacking != ATTACKING_NONE)
{

View file

@ -1997,7 +1997,6 @@ static void K_HandleLapIncrement(player_t *player)
player->lastsafestarpost = 0;
player->laps++;
if (mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE)
{
// SRB2Kart 281118
@ -2042,9 +2041,6 @@ static void K_HandleLapIncrement(player_t *player)
player->karthud[khud_lapanimation] = 80;
}
if (netgame && player->laps > numlaps)
CON_LogMessage(va(M_GetText("%s has finished the race.\n"), player_names[player-players]));
if (P_IsDisplayPlayer(player))
{
if (player->laps == numlaps) // final lap
@ -2072,6 +2068,8 @@ static void K_HandleLapIncrement(player_t *player)
{
P_DoPlayerExit(player);
P_SetupSignExit(player);
if (netgame)
CON_LogMessage(va(M_GetText("%s has finished the race.\n"), player_names[player-players]));
}
if (player->laps > player->latestlap)
@ -2096,7 +2094,8 @@ static void K_HandleLapIncrement(player_t *player)
player->latestlap = player->laps;
}
thwompsactive = true; // Lap 2 effects
if (player->laps > 1)
thwompsactive = true; // Lap 2 effects
player->grieftime = 0;
lowestLap = P_FindLowestLap();