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

fix: bots never rer-route their path in some situations

Browse source 
Co-Authored-By: Max <161382234+dyspose@users.noreply.github.com>
This commit is contained in:
jeefo 2024-04-19 13:20:17 +03:00
commit 2968a0adff
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/combat.cpp
View file

@ -271,9 +271,9 @@ bool Bot::lookupEnemies () {
m_states |= Sense::SuspectEnemy; m_states |= Sense::SuspectEnemy;
// check if last enemy can be penetrated // check if last enemy can be penetrated
const auto penetratePower = conf.findWeaponById (m_currentWeapon).penetratePower * 3; const auto penetratePower = conf.findWeaponById (m_currentWeapon).penetratePower * 4;
if (isPenetrableObstacle3 (m_lastEnemyOrigin, penetratePower)) { if (isPenetrableObstacle1 (m_lastEnemyOrigin, penetratePower)) {
m_aimFlags |= AimFlags::LastEnemy; m_aimFlags |= AimFlags::LastEnemy;
} }
} }

6
src/navigate.cpp
View file

@ -1165,7 +1165,7 @@ bool Bot::updateNavigation () {
desiredDistanceSq = 0.0f; desiredDistanceSq = 0.0f;
} }
else if (isOccupiedNode (m_path->number)) { else if (isOccupiedNode (m_path->number)) {
desiredDistanceSq = cr::sqrf (102.0f); desiredDistanceSq = cr::sqrf (120.0f);
} }
else { else {
desiredDistanceSq = cr::max (cr::sqrf (m_path->radius), desiredDistanceSq); desiredDistanceSq = cr::max (cr::sqrf (m_path->radius), desiredDistanceSq);
@ -1182,7 +1182,7 @@ bool Bot::updateNavigation () {
// needs precise placement - check if we get past the point // needs precise placement - check if we get past the point
if (desiredDistanceSq < cr::sqrf (16.0f) if (desiredDistanceSq < cr::sqrf (16.0f)
&& nodeDistanceSq < cr::sqrf (30.0f) && nodeDistanceSq < cr::sqrf (30.0f)
&& m_pathOrigin.distanceSq (pev->origin + pev->velocity * m_frameInterval) > nodeDistanceSq) { && m_pathOrigin.distanceSq (pev->origin + pev->velocity * m_frameInterval) >= nodeDistanceSq) {
desiredDistanceSq = nodeDistanceSq + 1.0f; desiredDistanceSq = nodeDistanceSq + 1.0f;
} }
@ -1752,7 +1752,7 @@ float Bot::getEstimatedNodeReachTime () {
float estimatedTime = longTermReachability ? 8.5f : 3.5f; float estimatedTime = longTermReachability ? 8.5f : 3.5f;
// if just fired at enemy, increase reachability // if just fired at enemy, increase reachability
if (m_shootTime + 0.15f < game.time ()) { if (m_shootTime + 0.25f > game.time ()) {
return estimatedTime; return estimatedTime;
} }