games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-05-22 09:55:17 +02:00
Code Issues Releases Activity

Significantly simplified threading model in battles

Browse Source
This commit is contained in:
Ivan Savenko
2023-07-18 19:55:59 +03:00
parent f27f5ebc7c
commit 1bf6bbd9b6
17 changed files with 93 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AI/BattleAI/BattleAI.cpp
+18 -8
View File
@@ -88,7 +88,7 @@ void CBattleAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::share
playerID = *CB->getPlayerID(); //TODO should be sth in callback
wasWaitingForRealize = CB->waitTillRealize;
wasUnlockingGs = CB->unlockGsWhenWaiting;
CB->waitTillRealize = true;
CB->waitTillRealize = false;
CB->unlockGsWhenWaiting = false;
movesSkippedByDefense = 0;
}
@@ -249,7 +249,7 @@ BattleAction CBattleAI::selectStackAction(const CStack * stack)
return BattleAction::makeDefend(stack);
}
BattleAction CBattleAI::activeStack( const CStack * stack )
void CBattleAI::activeStack( const CStack * stack )
{
LOG_TRACE_PARAMS(logAi, "stack: %s", stack->nodeName());
@@ -259,9 +259,15 @@ BattleAction CBattleAI::activeStack( const CStack * stack )
try
{
if(stack->creatureId() == CreatureID::CATAPULT)
return useCatapult(stack);
{
cb->battleMakeUnitAction(useCatapult(stack));
return;
}
if(stack->hasBonusOfType(BonusType::SIEGE_WEAPON) && stack->hasBonusOfType(BonusType::HEALER))
return useHealingTent(stack);
{
cb->battleMakeUnitAction(useHealingTent(stack));
return;
}
attemptCastingSpell();
@@ -271,11 +277,15 @@ BattleAction CBattleAI::activeStack( const CStack * stack )
//send special preudo-action
BattleAction cancel;
cancel.actionType = EActionType::CANCEL;
return cancel;
cb->battleMakeUnitAction(cancel);
return;
}
if(auto action = considerFleeingOrSurrendering())
return *action;
{
cb->battleMakeUnitAction(*action);
return;
}
result = selectStackAction(stack);
}
@@ -297,7 +307,7 @@ BattleAction CBattleAI::activeStack( const CStack * stack )
movesSkippedByDefense = 0;
}
return result;
cb->battleMakeUnitAction(result);
}
BattleAction CBattleAI::goTowardsNearest(const CStack * stack, std::vector<BattleHex> hexes) const
@@ -751,7 +761,7 @@ void CBattleAI::attemptCastingSpell()
spellcast.setTarget(castToPerform.dest);
spellcast.side = side;
spellcast.stackNumber = (!side) ? -1 : -2;
cb->battleMakeAction(&spellcast);
cb->battleMakeUnitAction(spellcast);
movesSkippedByDefense = 0;
}
else