games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge pull request #4019 from IvanSavenko/simturn_tweaks

Browse Source 
[1.5.2] Simturn tweaks
This commit is contained in:
Ivan Savenko
2024-05-21 14:18:42 +03:00
committed by GitHub
parent e5322eacfd 215b279ea8
commit c85ea98519
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/processors/TurnOrderProcessor.cpp
View File

@@ -17,6 +17,9 @@
#include "../CVCMIServer.h"
#include "../../lib/CPlayerState.h"
#include "../../lib/mapping/CMap.h"
#include "../../lib/mapObjects/CGObjectInstance.h"
#include "../../lib/gameState/CGameState.h"
#include "../../lib/pathfinder/CPathfinder.h"
#include "../../lib/pathfinder/PathfinderOptions.h"
@@ -102,6 +105,18 @@ bool TurnOrderProcessor::playersInContact(PlayerColor left, PlayerColor right) c
const auto * leftInfo = gameHandler->getPlayerState(left, false);
const auto * rightInfo = gameHandler->getPlayerState(right, false);
for (auto obj : gameHandler->gameState()->map->objects)
{
if (obj && obj->isVisitable())
{
int3 pos = obj->visitablePos();
if (obj->tempOwner == left)
leftReachability[pos.z][pos.x][pos.y] = true;
if (obj->tempOwner == right)
rightReachability[pos.z][pos.x][pos.y] = true;
}
}
for(const auto & hero : leftInfo->heroes)
{
CPathsInfo out(mapSize, hero);
@@ -174,6 +189,9 @@ bool TurnOrderProcessor::computeCanActSimultaneously(PlayerColor active, PlayerC
if (gameHandler->getDate(Date::DAY) > simturnsTurnsMaxLimit())
return false;
if (gameHandler->getStartInfo()->simturnsInfo.ignoreAlliedContacts && activeInfo->team == waitingInfo->team)
return true;
if (playersInContact(active, waiting))
return false;