mirror of
https://github.com/vcmi/vcmi.git
synced 2025-02-01 12:57:51 +02:00
Fixed one case when heroes exchanged armies until ran out of movement points.
This commit is contained in:
parent
6cfc89dc7c
commit
2f588b548e
@ -326,16 +326,16 @@ void VCAI::heroExchangeStarted(ObjectInstanceID hero1, ObjectInstanceID hero2, Q
|
||||
pickBestCreatures (secondHero, firstHero);
|
||||
else //regular criteria
|
||||
{
|
||||
if (firstHero->getFightingStrength() > secondHero->getFightingStrength() && canGetArmy (firstHero, secondHero))
|
||||
pickBestCreatures (firstHero, secondHero);
|
||||
else if (canGetArmy (secondHero, firstHero))
|
||||
pickBestCreatures (secondHero, firstHero);
|
||||
|
||||
completeGoal(sptr(Goals::VisitHero(firstHero->id.getNum()))); //TODO: what if we were visited by other hero in the meantime?
|
||||
completeGoal(sptr(Goals::VisitHero(secondHero->id.getNum())));
|
||||
//TODO: exchange artifacts
|
||||
if (firstHero->getFightingStrength() > secondHero->getFightingStrength() && canGetArmy(firstHero, secondHero))
|
||||
pickBestCreatures(firstHero, secondHero);
|
||||
else if (canGetArmy(secondHero, firstHero))
|
||||
pickBestCreatures(secondHero, firstHero);
|
||||
}
|
||||
|
||||
completeGoal(sptr(Goals::VisitHero(firstHero->id.getNum()))); //TODO: what if we were visited by other hero in the meantime?
|
||||
completeGoal(sptr(Goals::VisitHero(secondHero->id.getNum())));
|
||||
//TODO: exchange artifacts
|
||||
|
||||
answerQuery(query, 0);
|
||||
});
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user