diff --git a/AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp b/AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp index 5a8d0a24f..95dcb63a0 100644 --- a/AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp +++ b/AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp @@ -119,7 +119,7 @@ void DangerHitMapAnalyzer::updateHitMap() PathfinderSettings ps; - ps.scoutTurnDistanceLimit = ps.mainTurnDistanceLimit = ai->settings->getMainHeroTurnDistanceLimit(); + ps.scoutTurnDistanceLimit = ps.mainTurnDistanceLimit = ai->settings->getThreatTurnDistanceLimit(); ps.useHeroChain = false; ai->pathfinder->updatePaths(pair.second, ps); diff --git a/AI/Nullkiller/Engine/Settings.cpp b/AI/Nullkiller/Engine/Settings.cpp index 44ef27176..11357f9c1 100644 --- a/AI/Nullkiller/Engine/Settings.cpp +++ b/AI/Nullkiller/Engine/Settings.cpp @@ -28,6 +28,7 @@ namespace NKAI : maxRoamingHeroes(8), mainHeroTurnDistanceLimit(10), scoutHeroTurnDistanceLimit(5), + threatTurnDistanceLimit(5), maxGoldPressure(0.3f), retreatThresholdRelative(0.3), retreatThresholdAbsolute(10000), diff --git a/AI/Nullkiller/Engine/Settings.h b/AI/Nullkiller/Engine/Settings.h index 01f4f2a9c..ff2d1b859 100644 --- a/AI/Nullkiller/Engine/Settings.h +++ b/AI/Nullkiller/Engine/Settings.h @@ -24,6 +24,7 @@ namespace NKAI int maxRoamingHeroes; int mainHeroTurnDistanceLimit; int scoutHeroTurnDistanceLimit; + int threatTurnDistanceLimit; int maxPass; int maxPriorityPass; int pathfinderBucketsCount; @@ -52,6 +53,7 @@ namespace NKAI int getMaxRoamingHeroes() const { return maxRoamingHeroes; } int getMainHeroTurnDistanceLimit() const { return mainHeroTurnDistanceLimit; } int getScoutHeroTurnDistanceLimit() const { return scoutHeroTurnDistanceLimit; } + int getThreatTurnDistanceLimit() const { return threatTurnDistanceLimit; } int getPathfinderBucketsCount() const { return pathfinderBucketsCount; } int getPathfinderBucketSize() const { return pathfinderBucketSize; } bool isObjectGraphAllowed() const { return allowObjectGraph; } diff --git a/config/ai/nkai/nkai-settings.json b/config/ai/nkai/nkai-settings.json index 1a60fff8a..167d436ce 100644 --- a/config/ai/nkai/nkai-settings.json +++ b/config/ai/nkai/nkai-settings.json @@ -38,6 +38,7 @@ "maxPriorityPass" : 10, "mainHeroTurnDistanceLimit" : 10, "scoutHeroTurnDistanceLimit" : 5, + "threatTurnDistanceLimit" : 1, "maxGoldPressure" : 0.3, "updateHitmapOnTileReveal" : false, "useTroopsFromGarrisons" : true, @@ -58,6 +59,7 @@ "maxPriorityPass" : 10, "mainHeroTurnDistanceLimit" : 10, "scoutHeroTurnDistanceLimit" : 5, + "threatTurnDistanceLimit" : 4, "maxGoldPressure" : 0.3, "updateHitmapOnTileReveal" : false, "useTroopsFromGarrisons" : true, @@ -78,6 +80,7 @@ "maxPriorityPass" : 10, "mainHeroTurnDistanceLimit" : 10, "scoutHeroTurnDistanceLimit" : 5, + "threatTurnDistanceLimit" : 5, "maxGoldPressure" : 0.3, "updateHitmapOnTileReveal" : false, "useTroopsFromGarrisons" : true, @@ -98,6 +101,7 @@ "maxPriorityPass" : 10, "mainHeroTurnDistanceLimit" : 10, "scoutHeroTurnDistanceLimit" : 5, + "threatTurnDistanceLimit" : 5, "maxGoldPressure" : 0.3, "updateHitmapOnTileReveal" : false, "useTroopsFromGarrisons" : true, @@ -118,6 +122,7 @@ "maxPriorityPass" : 10, "mainHeroTurnDistanceLimit" : 10, "scoutHeroTurnDistanceLimit" : 5, + "threatTurnDistanceLimit" : 5, "maxGoldPressure" : 0.3, "updateHitmapOnTileReveal" : false, "useTroopsFromGarrisons" : true,