games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Nullkiller - rewrite decomposition, decomposition cache, morale management

Browse Source
This commit is contained in:
Andrii Danylchenko
2021-05-16 14:56:42 +03:00
committed by Andrii Danylchenko
parent 35a1167f3d
commit e385c83a88
18 changed files with 470 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
AI/Nullkiller/Goals/Composition.cpp
View File

@@ -45,52 +45,7 @@ void Composition::accept(VCAI * ai)
TGoalVec Composition::decompose() const
{
if(isElementar())
return subtasks;
auto tasks = subtasks;
tasks.pop_back();
TSubgoal last = subtasks.back();
auto decomposed = last->decompose();
TGoalVec result;
for(TSubgoal goal : decomposed)
{
if(goal->invalid() || goal == last || vstd::contains(tasks, goal))
continue;
auto newComposition = Composition(tasks);
if(goal->goalType == COMPOSITION)
{
Composition & other = dynamic_cast<Composition &>(*goal);
bool cancel = false;
for(auto subgoal : other.subtasks)
{
if(subgoal == last || vstd::contains(tasks, subgoal))
{
cancel = true;
break;
}
newComposition.addNext(subgoal);
}
if(cancel)
continue;
}
else
{
newComposition.addNext(goal);
}
result.push_back(sptr(newComposition));
}
return result;
return subtasks;
}
Composition & Composition::addNext(const AbstractGoal & goal)
@@ -100,7 +55,16 @@ Composition & Composition::addNext(const AbstractGoal & goal)
Composition & Composition::addNext(TSubgoal goal)
{
subtasks.push_back(goal);
if(goal->goalType == COMPOSITION)
{
Composition & other = dynamic_cast<Composition &>(*goal);
vstd::concatenate(subtasks, other.subtasks);
}
else
{
subtasks.push_back(goal);
}
return *this;
}