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

Merge pull request #548 from yapb/issue-542

Browse source 
fix: node selection when there's too less important nodes (fix #542)
This commit is contained in:
jeefo 2024-03-29 00:21:59 +03:00 • committed by GitHub
commit 8a22f03640
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/navigate.cpp
View file

@ -383,19 +383,30 @@ void Bot::postprocessGoals (const IntArray &goals, int result[]) {
}
return isOccupiedNode (index);
};
static IntArray resulting {};
resulting.clear ();
// too less to choice from just return all the goals
// too less to choice from, this is usually waypointer mistake, number of def/offensive points count should be minimum of 4
if (goals.length () < 4) {
for (size_t i = 0; i < goals.length (); ++i) {
result[i] = goals[i];
}
return;
auto refill = [] (const IntArray &data) {
if (!data.empty ()) {
resulting.insert (0, data);
}
};
// combine defensive and offensive and goals together to give a chance to proceed
refill (graph.m_ctPoints);
refill (graph.m_terrorPoints);
refill (graph.m_goalPoints);
}
else {
resulting.insert (0, goals);
}
for (int index = 0; index < 4; ++index) {
const auto goal = goals.random ();
const auto goal = resulting.random ();
if (recurseCount <= cr::max (4, goals.length <int> ()) && isRecentOrHistorical (goal)) {
if (recurseCount <= cr::max (4, resulting.length <int> ()) && isRecentOrHistorical (goal)) {
if (index > 0) {
index--;
}