games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Remove excessive recomputations of tile owners

Browse Source
This commit is contained in:
Ivan Savenko
2025-01-08 14:38:55 +00:00
parent 82e8db3037
commit ec9dbfd667
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
AI/Nullkiller/AIGateway.cpp
View File

@@ -285,8 +285,8 @@ void AIGateway::tileRevealed(const std::unordered_set<int3> & pos)
addVisitableObj(obj);
}
if (nullkiller->settings->isUpdateHitmapOnTileReveal())
nullkiller->dangerHitMap->reset();
if (nullkiller->settings->isUpdateHitmapOnTileReveal() && !pos.empty())
nullkiller->dangerHitMap->resetTileOwners();
}
void AIGateway::heroExchangeStarted(ObjectInstanceID hero1, ObjectInstanceID hero2, QueryID query)
@@ -389,9 +389,10 @@ void AIGateway::objectRemoved(const CGObjectInstance * obj, const PlayerColor &
}
if(obj->ID == Obj::HERO && cb->getPlayerRelations(obj->tempOwner, playerID) == PlayerRelations::ENEMIES)
{
nullkiller->dangerHitMap->reset();
}
nullkiller->dangerHitMap->resetHitmap();
if(obj->ID == Obj::TOWN)
nullkiller->dangerHitMap->resetTileOwners();
}
void AIGateway::showHillFortWindow(const CGObjectInstance * object, const CGHeroInstance * visitor)
@@ -507,7 +508,7 @@ void AIGateway::objectPropertyChanged(const SetObjectProperty * sop)
else if(relations == PlayerRelations::SAME_PLAYER && obj->ID == Obj::TOWN)
{
// reevaluate defence for a new town
nullkiller->dangerHitMap->reset();
nullkiller->dangerHitMap->resetHitmap();
}
}
}
@@ -1246,7 +1247,7 @@ void AIGateway::addVisitableObj(const CGObjectInstance * obj)
if(obj->ID == Obj::HERO && cb->getPlayerRelations(obj->tempOwner, playerID) == PlayerRelations::ENEMIES)
{
nullkiller->dangerHitMap->reset();
nullkiller->dangerHitMap->resetHitmap();
}
}

6
AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp
View File

@@ -345,10 +345,4 @@ std::set<const CGObjectInstance *> DangerHitMapAnalyzer::getOneTurnAccessibleObj
return result;
}
void DangerHitMapAnalyzer::reset()
{
hitMapUpToDate = false;
tileOwnersUpToDate = false;
}
}

2
AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.h
View File

@@ -87,7 +87,7 @@ public:
const HitMapNode & getObjectThreat(const CGObjectInstance * obj) const;
const HitMapNode & getTileThreat(const int3 & tile) const;
std::set<const CGObjectInstance *> getOneTurnAccessibleObjects(const CGHeroInstance * enemy) const;
void reset();
void resetHitmap() {hitMapUpToDate = false;}
void resetTileOwners() { tileOwnersUpToDate = false; }
PlayerColor getTileOwner(const int3 & tile) const;
const CGTownInstance * getClosestTown(const int3 & tile) const;

2
AI/Nullkiller/Engine/Nullkiller.cpp
View File

@@ -229,7 +229,7 @@ void Nullkiller::resetAiState()
lockedResources = TResources();
scanDepth = ScanDepth::MAIN_FULL;
lockedHeroes.clear();
dangerHitMap->reset();
dangerHitMap->resetHitmap();
useHeroChain = true;
objectClusterizer->reset();

10
config/ai/nkai/nkai-settings.json
View File

@@ -40,7 +40,7 @@
"scoutHeroTurnDistanceLimit" : 5,
"threatTurnDistanceLimit" : 1,
"maxGoldPressure" : 0.3,
"updateHitmapOnTileReveal" : false,
"updateHitmapOnTileReveal" : true,
"useTroopsFromGarrisons" : true,
"openMap": true,
"allowObjectGraph": false,
@@ -61,7 +61,7 @@
"scoutHeroTurnDistanceLimit" : 5,
"threatTurnDistanceLimit" : 4,
"maxGoldPressure" : 0.3,
"updateHitmapOnTileReveal" : false,
"updateHitmapOnTileReveal" : true,
"useTroopsFromGarrisons" : true,
"openMap": true,
"allowObjectGraph": false,
@@ -82,7 +82,7 @@
"scoutHeroTurnDistanceLimit" : 5,
"threatTurnDistanceLimit" : 5,
"maxGoldPressure" : 0.3,
"updateHitmapOnTileReveal" : false,
"updateHitmapOnTileReveal" : true,
"useTroopsFromGarrisons" : true,
"openMap": true,
"allowObjectGraph": false,
@@ -103,7 +103,7 @@
"scoutHeroTurnDistanceLimit" : 5,
"threatTurnDistanceLimit" : 5,
"maxGoldPressure" : 0.3,
"updateHitmapOnTileReveal" : false,
"updateHitmapOnTileReveal" : true,
"useTroopsFromGarrisons" : true,
"openMap": true,
"allowObjectGraph": false,
@@ -124,7 +124,7 @@
"scoutHeroTurnDistanceLimit" : 5,
"threatTurnDistanceLimit" : 5,
"maxGoldPressure" : 0.3,
"updateHitmapOnTileReveal" : false,
"updateHitmapOnTileReveal" : true,
"useTroopsFromGarrisons" : true,
"openMap": true,
"allowObjectGraph": false,