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

nav: reset goal when clearing current path

Browse source 
nav: stop navigation if last node is occupied
aim: speedup aiming only when enemy reachable
This commit is contained in:
jeefo 2023-04-16 19:37:26 +03:00
commit 6ef03fc9fd
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/navigate.cpp
View file

@ -1067,9 +1067,10 @@ bool Bot::updateNavigation () {
// will go in cycle, and forcing bot to re-create new route. // will go in cycle, and forcing bot to re-create new route.
if (m_pathWalk.hasNext () && m_pathWalk.next () == m_pathWalk.last () && isOccupiedNode (m_pathWalk.next (), true)) { if (m_pathWalk.hasNext () && m_pathWalk.next () == m_pathWalk.last () && isOccupiedNode (m_pathWalk.next (), true)) {
getTask ()->data = kInvalidNodeIndex; getTask ()->data = kInvalidNodeIndex;
clearSearchNodes (); m_currentNodeIndex = kInvalidNodeIndex;
return true; clearSearchNodes ();
return false;
} }
if (nodeDistance < desiredDistance) { if (nodeDistance < desiredDistance) {
@ -1748,6 +1749,7 @@ void Bot::findPath (int srcIndex, int destIndex, FindPath pathType /*= FindPath:
void Bot::clearSearchNodes () { void Bot::clearSearchNodes () {
m_pathWalk.clear (); m_pathWalk.clear ();
m_chosenGoalIndex = kInvalidNodeIndex;
} }
void Bot::clearRoute () { void Bot::clearRoute () {
@ -3194,7 +3196,7 @@ void Bot::updateLookAngles () {
float stiffness = 200.0f; float stiffness = 200.0f;
float damping = 25.0f; float damping = 25.0f;
if (((m_aimFlags & (AimFlags::Enemy | AimFlags::Entity | AimFlags::Grenade)) || m_wantsToFire || usesKnife ()) && m_difficulty > Difficulty::Normal) { if (((m_aimFlags & (AimFlags::Enemy | AimFlags::Entity | AimFlags::Grenade)) || m_isEnemyReachable) && m_difficulty > Difficulty::Normal) {
if (m_difficulty == Difficulty::Expert) { if (m_difficulty == Difficulty::Expert) {
accelerate += 600.0f; accelerate += 600.0f;
} }