games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Merge pull request #3612 from IvanSavenko/demon_summon_fix

Browse Source 
Fixes demon summoning
This commit is contained in:
Ivan Savenko 2024-02-13 16:05:13 +02:00 committed by GitHub
commit 7cf5e317a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
server/battles/BattleResultProcessor.cpp
View File

@ -47,26 +47,31 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CBattleInfoCallback & battle,
PlayerColor color = battle.sideToPlayer(sideInBattle);
for(const CStack * stConst : battle.battleGetAllStacks(true))
auto allStacks = battle.battleGetStacksIf([color](const CStack * stack){
if (stack->summoned)//don't take into account temporary summoned stacks
return false;
if(stack->unitOwner() != color) //remove only our stacks
return false;
if (stack->isTurret())
return false;
return true;
});
for(const CStack * stConst : allStacks)
{
// Use const cast - in order to call non-const "takeResurrected" for proper calculation of casualties
// TODO: better solution
CStack * st = const_cast<CStack*>(stConst);
if(st->summoned) //don't take into account temporary summoned stacks
continue;
if(st->unitOwner() != color) //remove only our stacks
continue;
logGlobal->debug("Calculating casualties for %s", st->nodeName());
st->health.takeResurrected();
if(st->unitSlot() == SlotID::ARROW_TOWERS_SLOT)
{
logGlobal->debug("Ignored arrow towers stack.");
}
else if(st->unitSlot() == SlotID::WAR_MACHINES_SLOT)
if(st->unitSlot() == SlotID::WAR_MACHINES_SLOT)
{
auto warMachine = st->unitType()->warMachine;
@ -125,15 +130,9 @@ CasualtiesAfterBattle::CasualtiesAfterBattle(const CBattleInfoCallback & battle,
StackLocation sl(army, st->unitSlot());
newStackCounts.push_back(TStackAndItsNewCount(sl, 0));
}
else if(st->getCount() < army->getStackCount(st->unitSlot()))
else if(st->getCount() != army->getStackCount(st->unitSlot()))
{
logGlobal->debug("Stack lost %d units.", army->getStackCount(st->unitSlot()) - st->getCount());
StackLocation sl(army, st->unitSlot());
newStackCounts.push_back(TStackAndItsNewCount(sl, st->getCount()));
}
else if(st->getCount() > army->getStackCount(st->unitSlot()))
{
logGlobal->debug("Stack gained %d units.", st->getCount() - army->getStackCount(st->unitSlot()));
logGlobal->debug("Stack size changed: %d -> %d units.", army->getStackCount(st->unitSlot()), st->getCount());
StackLocation sl(army, st->unitSlot());
newStackCounts.push_back(TStackAndItsNewCount(sl, st->getCount()));
}
@ -596,7 +595,18 @@ void BattleResultProcessor::setBattleResult(const CBattleInfoCallback & battle,
battleResult->result = resultType;
battleResult->winner = victoriusSide; //surrendering side loses
for(const auto & st : battle.battleGetAllStacks(true)) //setting casualties
auto allStacks = battle.battleGetStacksIf([](const CStack * stack){
if (stack->summoned)//don't take into account temporary summoned stacks
return false;
if (stack->isTurret())
return false;
return true;
});
for(const auto & st : allStacks) //setting casualties
{
si32 killed = st->getKilled();
if(killed > 0)