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

Fix the Bot Flame Shield usage.

Browse source 
Turns out negative itemconfirm was a shitty hack. Lets rewrite this to use itemdelay instead.
This commit is contained in:
NepDisk 2025-08-31 20:57:47 -04:00
parent d2c010ea01
commit 0efd36ac5d
1 changed files with 47 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/k_botitem.cpp
View file

@ -988,40 +988,46 @@ static void K_BotItemFlame(botdata_t *bd, const player_t *player)
if (P_IsObjectOnGround(player->mo) == false)
{
// Drain itemdelay as needed so theres no delay when landing.
if (bd->itemdelay)
{
bd->itemdelay--;
bd->itemconfirm = 0;
}
// Don't use while mid-air.
return;
}
if (bd->itemconfirm > TICRATE)
if (player->botvars.difficulty < 6 || player->flametimer <= 2*TICRATE)
{
if (player->botvars.difficulty >= 6 && player->flametimer <= 2*TICRATE)
// We aren't smart enough to use this properly.
// ...or we are doing the finishing blow.
bd->itemdown = true;
bd->itemdelay = 0;
bd->itemconfirm++;
return;
}
if (!bd->itemdelay)
{
if (player->flamestore < FLAMESTOREMAX - TICRATE/4)
{
bd->itemdown = true;
bd->itemconfirm = 0;
}
else if (player->flametimer > 0)
else
{
if (player->botvars.difficulty < 6 || player->flamestore < FLAMESTOREMAX - TICRATE/4)
{
bd->itemdown = true;
bd->itemconfirm = 0;
}
else
{
UINT8 difficultyadjust = MAXBOTDIFFICULTY - player->botvars.difficulty;
bd->itemconfirm = (-TICRATE/2) - difficultyadjust;
}
}
}
else
{
if (player->botvars.difficulty >= 6 && player->flametimer <= 2*TICRATE)
{
bd->itemconfirm = 0;
UINT8 difficultyadjust = MAXBOTDIFFICULTY - player->botvars.difficulty;
bd->itemdelay = (TICRATE/2) + difficultyadjust;
}
bd->itemconfirm++;
}
else
{
bd->itemdelay--;
bd->itemconfirm = 0;
}
}
// Item usage for rings.
@ -1185,6 +1191,25 @@ static void K_BotItemRouletteMash(botdata_t *bd, const player_t *player)
}
}
// Determines if we should use the Regular Item Delay Logic.
static boolean K_CanHandleItemDelay(botdata_t *bd, const player_t *player)
{
if (!bd->itemdelay)
{
// We don't even have any. Don't bother.
return false;
}
if (player->flametimer > 0)
{
// Flame Shield? We handle this there instead.
return false
}
return true;
}
// See header file for description.
void K_BotItemUsage(botdata_t *bd, const player_t *player)
{
@ -1200,7 +1225,7 @@ void K_BotItemUsage(botdata_t *bd, const player_t *player)
return;
}
if (bd->itemdelay)
if (K_CanHandleItemDelay(bd, player))
{
bd->itemdelay--;
bd->itemconfirm = 0;