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

Simplify code, fix AI not building dwelling upgrades

Browse Source
This commit is contained in:
Ivan Savenko
2025-01-06 18:59:37 +00:00
parent 8468469976
commit 3d3dd70a11
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
AI/Nullkiller/Analyzers/BuildAnalyzer.cpp
View File

@@ -18,36 +18,36 @@ namespace NKAI
void BuildAnalyzer::updateTownDwellings(TownDevelopmentInfo & developmentInfo)
{
std::map<BuildingID, BuildingID> parentMap;
for(auto &pair : developmentInfo.town->getTown()->buildings)
{
if(pair.second->upgrade != BuildingID::NONE)
{
parentMap[pair.second->upgrade] = pair.first;
}
}
for(int level = 0; level < developmentInfo.town->getTown()->creatures.size(); level++)
{
logAi->trace("Checking dwelling level %d", level);
std::vector<BuildingID> dwellingsInTown;
for(BuildingID buildID = BuildingID::getDwellingFromLevel(level, 0); buildID.hasValue(); BuildingID::advanceDwelling(buildID))
if(developmentInfo.town->getTown()->buildings.count(buildID) != 0)
dwellingsInTown.push_back(buildID);
// find best, already built dwelling
for (const auto & buildID : boost::adaptors::reverse(dwellingsInTown))
{
if(developmentInfo.town->getTown()->buildings.count(buildID) == 0)
continue; // no such building in town
auto info = getBuildingOrPrerequisite(developmentInfo.town, buildID);
if (!info.exists && !info.canBuild && !info.notEnoughRes)
if (!developmentInfo.town->hasBuilt(buildID))
continue;
if(info.exists)
developmentInfo.addExistingDwelling(info);
else
developmentInfo.addBuildingToBuild(info);
const auto & info = getBuildingOrPrerequisite(developmentInfo.town, buildID);
developmentInfo.addExistingDwelling(info);
break;
}
// find all non-built dwellings that can be built and add them for consideration
for (const auto & buildID : dwellingsInTown)
{
if (developmentInfo.town->hasBuilt(buildID))
continue;
const auto & info = getBuildingOrPrerequisite(developmentInfo.town, buildID);
if (info.canBuild || info.notEnoughRes)
developmentInfo.addBuildingToBuild(info);
}
}
}