games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-14 10:12:59 +02:00
Code Issues Releases Activity

AI improvements

Browse Source 
Deliberately defending towns in danger will now only be performed when the town has at least a citatel.

The AI will now count the buildings per town-type and add a score-bonus to dwellings of towns it already has a lot of buildings of. This shall help with getting a stronger army with less morale-issues.

Scoring for mage-guild now increased the bigger the existing armies are.

AI is less afraid of enemy-heros than previously.
This commit is contained in:
Xilmi 2024-08-11 18:21:24 +02:00
parent 3218363bc0
commit 958aeb3a60
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
AI/Nullkiller/Engine/PriorityEvaluator.cpp
View File

@ -57,6 +57,7 @@ EvaluationContext::EvaluationContext(const Nullkiller* ai)
threat(0), threat(0),
armyGrowth(0), armyGrowth(0),
armyInvolvement(0), armyInvolvement(0),
defenseValue(0),
isDefend(false), isDefend(false),
involvesSailing(false), involvesSailing(false),
isTradeBuilding(false) isTradeBuilding(false)
@ -999,6 +1000,7 @@ public:
else else
evaluationContext.addNonCriticalStrategicalValue(1.7f * multiplier * strategicalValue); evaluationContext.addNonCriticalStrategicalValue(1.7f * multiplier * strategicalValue);
evaluationContext.defenseValue = town->fortLevel();
evaluationContext.isDefend = true; evaluationContext.isDefend = true;
vstd::amax(evaluationContext.danger, defendTown.getTreat().danger); vstd::amax(evaluationContext.danger, defendTown.getTreat().danger);
@ -1207,6 +1209,13 @@ public:
evaluationContext.addNonCriticalStrategicalValue(potentialUpgradeValue / 10000.0f / (float)bi.prerequisitesCount); evaluationContext.addNonCriticalStrategicalValue(potentialUpgradeValue / 10000.0f / (float)bi.prerequisitesCount);
evaluationContext.armyReward += potentialUpgradeValue / (float)bi.prerequisitesCount; evaluationContext.armyReward += potentialUpgradeValue / (float)bi.prerequisitesCount;
} }
int sameTownBonus = 0;
for (auto town : cb->getTownsInfo())
{
if (buildThis.town->getFaction() == town->getFaction())
sameTownBonus+=town->getTownLevel();
}
evaluationContext.armyReward *= sameTownBonus;
} }
else if(bi.id == BuildingID::CITADEL || bi.id == BuildingID::CASTLE) else if(bi.id == BuildingID::CITADEL || bi.id == BuildingID::CASTLE)
{ {
@ -1216,6 +1225,10 @@ public:
else if(bi.id >= BuildingID::MAGES_GUILD_1 && bi.id <= BuildingID::MAGES_GUILD_5) else if(bi.id >= BuildingID::MAGES_GUILD_1 && bi.id <= BuildingID::MAGES_GUILD_5)
{ {
evaluationContext.skillReward += 2 * (bi.id - BuildingID::MAGES_GUILD_1); evaluationContext.skillReward += 2 * (bi.id - BuildingID::MAGES_GUILD_1);
for (auto hero : cb->getHeroesInfo())
{
evaluationContext.armyInvolvement += hero->getArmyCost();
}
} }
if(evaluationContext.goldReward) if(evaluationContext.goldReward)
@ -1365,9 +1378,9 @@ float PriorityEvaluator::evaluate(Goals::TSubgoal task, int priorityTier)
case 0: //Take towns case 0: //Take towns
{ {
//score += evaluationContext.conquestValue * 1000; //score += evaluationContext.conquestValue * 1000;
if(evaluationContext.conquestValue > 0 || (evaluationContext.isDefend && evaluationContext.turn <= 1 && evaluationContext.threat > evaluationContext.armyInvolvement)) if(evaluationContext.conquestValue > 0 || (evaluationContext.defenseValue >= CGTownInstance::EFortLevel::CITADEL && evaluationContext.turn <= 1 && evaluationContext.threat > evaluationContext.armyInvolvement))
score = 1000; score = 1000;
if (score == 0 || (evaluationContext.enemyHeroDangerRatio > 0.5 && evaluationContext.turn > 0 && !ai->cb->getTownsInfo().empty())) if (score == 0 || (evaluationContext.enemyHeroDangerRatio > 1 && evaluationContext.turn > 0 && !ai->cb->getTownsInfo().empty()))
return 0; return 0;
if (maxWillingToLose - evaluationContext.armyLossPersentage < 0) if (maxWillingToLose - evaluationContext.armyLossPersentage < 0)
return 0; return 0;
@ -1378,7 +1391,7 @@ float PriorityEvaluator::evaluate(Goals::TSubgoal task, int priorityTier)
} }
case 1: //Collect unguarded stuff case 1: //Collect unguarded stuff
{ {
if (evaluationContext.enemyHeroDangerRatio > 0.5 && !evaluationContext.isDefend) if (evaluationContext.enemyHeroDangerRatio > 1 && !evaluationContext.isDefend)
return 0; return 0;
if (evaluationContext.isDefend && evaluationContext.enemyHeroDangerRatio == 0) if (evaluationContext.isDefend && evaluationContext.enemyHeroDangerRatio == 0)
return 0; return 0;
@ -1408,7 +1421,7 @@ float PriorityEvaluator::evaluate(Goals::TSubgoal task, int priorityTier)
} }
case 2: //Collect guarded stuff case 2: //Collect guarded stuff
{ {
if (evaluationContext.enemyHeroDangerRatio > 0.5 && !evaluationContext.isDefend) if (evaluationContext.enemyHeroDangerRatio > 1 && !evaluationContext.isDefend)
return 0; return 0;
if (evaluationContext.buildingCost.marketValue() > 0) if (evaluationContext.buildingCost.marketValue() > 0)
return 0; return 0;
@ -1445,7 +1458,7 @@ float PriorityEvaluator::evaluate(Goals::TSubgoal task, int priorityTier)
if (!evaluationContext.isTradeBuilding && ai->getFreeResources()[EGameResID::WOOD] - evaluationContext.buildingCost[EGameResID::WOOD] < 5 && ai->buildAnalyzer->getDailyIncome()[EGameResID::WOOD] < 1) if (!evaluationContext.isTradeBuilding && ai->getFreeResources()[EGameResID::WOOD] - evaluationContext.buildingCost[EGameResID::WOOD] < 5 && ai->buildAnalyzer->getDailyIncome()[EGameResID::WOOD] < 1)
{ {
logAi->trace("Should make sure to build market-place instead of %s", task->toString()); logAi->trace("Should make sure to build market-place instead of %s", task->toString());
for (auto town : cb->getTownsInfo()) for (auto town : ai->cb->getTownsInfo())
{ {
if (!town->hasBuiltSomeTradeBuilding()) if (!town->hasBuiltSomeTradeBuilding())
return 0; return 0;
@ -1468,7 +1481,7 @@ float PriorityEvaluator::evaluate(Goals::TSubgoal task, int priorityTier)
} }
else else
{ {
if (evaluationContext.enemyHeroDangerRatio > 0.5 && !evaluationContext.isDefend) if (evaluationContext.enemyHeroDangerRatio > 1 && !evaluationContext.isDefend && evaluationContext.conquestValue == 0)
return 0; return 0;
} }
break; break;

1
AI/Nullkiller/Engine/PriorityEvaluator.h
View File

@ -73,6 +73,7 @@ struct DLL_EXPORT EvaluationContext
float enemyHeroDangerRatio; float enemyHeroDangerRatio;
float threat; float threat;
float armyInvolvement; float armyInvolvement;
int defenseValue;
bool isDefend; bool isDefend;
TResources buildingCost; TResources buildingCost;
bool involvesSailing; bool involvesSailing;