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

fix: breakable problems on some maps

Browse source 
nav: do not consider busy nodes as long-radii
nav: more fixes to player avoidance
This commit is contained in:
jeefo 2025-02-01 16:17:11 +03:00
commit 2a6ca1d914
No known key found for this signature in database
GPG key ID: D696786B81B667C8
3 changed files with 51 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/botlib.cpp
View file

@ -268,7 +268,7 @@ edict_t *Bot::lookupBreakable () {
// check if this isn't a triggered (bomb) breakable and if it takes damage. if true, shoot the crap!
if (util.isBreakableEntity (hit)) {
m_breakableOrigin = tr.vecEndPos;
m_breakableOrigin = game.getEntityOrigin (hit);
m_breakableEntity = hit;
return hit;
@ -276,14 +276,26 @@ edict_t *Bot::lookupBreakable () {
}
return nullptr;
};
auto isGoodForUs = [&] (edict_t *ent) -> bool {
if (game.isNullEntity (ent)) {
return false;
}
for (const auto &br : m_ignoredBreakable) {
if (br == ent) {
return false;
}
}
return true;
};
auto hit = doLookup (pev->origin, m_destOrigin, detectBreakableDistance);
if (!game.isNullEntity (hit)) {
if (isGoodForUs (hit)) {
return hit;
}
hit = doLookup (getEyesPos (), m_destOrigin, detectBreakableDistance);
if (!game.isNullEntity (hit)) {
if (isGoodForUs (hit)) {
return hit;
}
m_breakableEntity = nullptr;
@ -4146,7 +4158,7 @@ void Bot::enteredBuyZone (int buyState) {
// if bot is in buy zone, try to buy ammo for this weapon...
if (m_seeEnemyTime + 12.0f < game.time ()
&& m_lastEquipTime + 15.0f < game.time ()
&& m_lastEquipTime + 30.0f < game.time ()
&& m_inBuyZone
&& (bots.getRoundStartTime () + rg (10.0f, 20.0f) + mp_buytime.as <float> () < game.time ())
&& !bots.isBombPlanted ()