Merge branch 'slower-cpu-shields' into 'master'

Add bot lshield/bshield prediction error

See merge request KartKrew/Kart!2386
This commit is contained in:
Oni 2024-05-17 23:06:24 +00:00
commit 86df8b7c54

View file

@ -31,6 +31,7 @@
#include "m_random.h" #include "m_random.h"
#include "r_things.h" // numskins #include "r_things.h" // numskins
#include "k_roulette.h" #include "k_roulette.h"
#include "m_easing.h"
/*-------------------------------------------------- /*--------------------------------------------------
static inline boolean K_ItemButtonWasDown(const player_t *player) static inline boolean K_ItemButtonWasDown(const player_t *player)
@ -1193,7 +1194,10 @@ static void K_BotItemLightning(const player_t *player, ticcmd_t *cmd)
{ {
ZoneScoped; ZoneScoped;
if (K_BotUseItemNearPlayer(player, cmd, 192*player->mo->scale) == false) fixed_t radius = 192 * player->mo->scale;
radius = Easing_Linear(FRACUNIT * player->botvars.difficulty / MAXBOTDIFFICULTY, 2*radius, radius);
if (K_BotUseItemNearPlayer(player, cmd, radius) == false)
{ {
if (player->botvars.itemconfirm > 10*TICRATE) if (player->botvars.itemconfirm > 10*TICRATE)
{ {
@ -1232,7 +1236,8 @@ static void K_BotItemBubble(const player_t *player, ticcmd_t *cmd)
if (player->bubblecool <= 0) if (player->bubblecool <= 0)
{ {
const fixed_t radius = 192 * player->mo->scale; fixed_t radius = 192 * player->mo->scale;
radius = Easing_Linear(FRACUNIT * player->botvars.difficulty / MAXBOTDIFFICULTY, 2*radius, radius);
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {