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

fix: problems with breakable on cs_mari (ref #686)

Browse source 
fix: goal selection on some zombie  maps (ref #684)
This commit is contained in:
jeefo 2025-04-03 15:12:06 +03:00
commit d6d76e136d
No known key found for this signature in database
GPG key ID: D696786B81B667C8
12 changed files with 95 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tasks.cpp
View file

@ -1473,9 +1473,9 @@ void Bot::shootBreakable_ () {
}
else {
TraceResult tr {};
game.testLine (pev->origin, m_breakableOrigin, TraceIgnore::None, ent (), &tr);
game.testLine (pev->origin, m_breakableOrigin, TraceIgnore::Monsters , ent (), &tr);
if (tr.pHit != m_breakableEntity || !util.isVisible (tr.vecEndPos, ent ())) {
if (tr.pHit != m_breakableEntity && !cr::fequal (tr.flFraction, 1.0f)) {
m_ignoredBreakable.push (tr.pHit);
m_breakableEntity = nullptr;
@ -1494,8 +1494,6 @@ void Bot::shootBreakable_ () {
m_navTimeset = game.time ();
m_lookAtSafe = m_breakableOrigin;
const float distToObstacle = pev->origin.distanceSq (m_lookAtSafe);
// is bot facing the breakable?
if (util.getConeDeviation (ent (), m_lookAtSafe) >= 0.90f) {
m_moveSpeed = 0.0f;
@ -1510,6 +1508,7 @@ void Bot::shootBreakable_ () {
pev->button |= IN_ATTACK;
}
}
const float distToObstacle = pev->origin.distanceSq (m_lookAtSafe);
// if with knife with no ammo, recompute breakable distance
if (!hasAnyAmmoInClip ()
@ -1703,6 +1702,7 @@ void Bot::pickupItem_ () {
for (const auto &client : util.getClients ()) {
if ((client.flags & ClientFlags::Used) && !(client.ent->v.flags & FL_FAKECLIENT) && (client.flags & ClientFlags::Alive) &&
client.team == m_team && client.ent->v.origin.distanceSq (ent->v.origin) <= cr::sqrf (240.0f)) {
return EntitySearchResult::Continue;
}
}