markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bot: disable spray logo task on xash3d engine

Browse source 
fix: crash on aarch64 builds (ref #667)
nav: improved player avoidance
nav: improved handling of short path radii
conf: control min and max cvar values
build: probably fix i386 build when building with cmake (untested)
This commit is contained in:
jeefo 2025-01-31 19:32:24 +03:00
commit e820527703
No known key found for this signature in database
GPG key ID: D696786B81B667C8
12 changed files with 104 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/manager.cpp
View file

@ -1233,12 +1233,13 @@ Bot::Bot (edict_t *bot, int difficulty, int personality, int team, int skin) {
// just to be sure
m_msgQueue.clear ();
// init path walker
m_pathWalk.init (graph.getMaxRouteLength ());
// init async planner
m_planner = cr::makeUnique <AStarAlgo> (graph.length ());
// init path walker
m_pathWalk.init (m_planner->getMaxLength ());
// init player models parts enumerator
m_hitboxEnumerator = cr::makeUnique <PlayerHitboxEnumerator> ();
@ -1291,7 +1292,9 @@ int BotManager::getAliveHumansCount () {
int count = 0;
for (const auto &client : util.getClients ()) {
if ((client.flags & ClientFlags::Alive) && !bots[client.ent] && !(client.ent->v.flags & FL_FAKECLIENT)) {
if ((client.flags & ClientFlags::Alive)
&& !bots[client.ent]
&& !(client.ent->v.flags & FL_FAKECLIENT)) {
++count;
}
}
@ -1299,24 +1302,28 @@ int BotManager::getAliveHumansCount () {
}
int BotManager::getPlayerPriority (edict_t *ent) {
constexpr auto kHighPriority = 512;
constexpr auto kHighPriority = 1024;
// always check for only our own bots
auto bot = bots[ent];
// if player just return high prio
if (!bot) {
return game.indexOfEntity (ent) + kHighPriority;
return game.indexOfEntity (ent) + kHighPriority * 2;
}
// give bots some priority
if (bot->m_hasC4 || bot->m_isVIP || bot->m_hasHostage || bot->m_healthValue < ent->v.health || (bot->m_currentTravelFlags & PathFlag::Jump)) {
if (bot->m_hasC4 || bot->m_isVIP || bot->m_hasHostage || (bot->m_currentTravelFlags & PathFlag::Jump)) {
return bot->entindex () + kHighPriority;
}
const auto task = bot->getCurrentTaskId ();
// higher priority if camping or hiding
if (task == Task::Camp || task == Task::Hide || task == Task::MoveToPosition) {
// higher priority if important task
if (task == Task::MoveToPosition
|| task == Task::SeekCover
|| task == Task::Camp
|| task == Task::Hide) {
return bot->entindex () + kHighPriority;
}
return bot->entindex ();
@ -1623,6 +1630,7 @@ void Bot::newRound () {
m_zoomCheckTime = 0.0f;
m_strafeSetTime = 0.0f;
m_dodgeStrafeDir = Dodge::None;
m_avoidAction = Dodge::None;
m_fightStyle = Fight::None;
m_lastFightStyleCheck = 0.0f;