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

Merge pull request #481 from vcmi/VCAI_fixes

Browse Source 
Vcai fixes
This commit is contained in:
DjWarmonger 2018-08-22 10:41:12 +02:00 committed by GitHub
commit 2b6bb0f4c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AI/VCAI/BuildingManager.cpp
View File

@ -105,8 +105,13 @@ boost::optional<BuildingID> BuildingManager::canBuildAnyStructure(const CGTownIn
{
if (t->hasBuilt(building))
continue;
if (cb->canBuildStructure(t, building))
return boost::optional<BuildingID>(building);
switch (cb->canBuildStructure(t, building))
{
case EBuildingState::ALLOWED:
case EBuildingState::NO_RESOURCES: //TODO: allow this via optional parameter?
return boost::optional<BuildingID>(building);
break;
}
}
return boost::optional<BuildingID>(); //Can't build anything
}

29
AI/VCAI/Goals.cpp
View File

@ -1052,12 +1052,17 @@ TSubgoal BuildThis::whatToDoToAchieve()
}
if (town) //we have specific town to build this
{
if (cb->canBuildStructure(town, b) != EBuildingState::ALLOWED) //FIXME: decompose further? kind of mess if we're here
throw cannotFulfillGoalException("Not possible to build");
else
switch (cb->canBuildStructure(town, b))
{
auto res = town->town->buildings.at(BuildingID(bid))->resources;
return ah->whatToDo(res, iAmElementar()); //realize immediately or gather resources
case EBuildingState::ALLOWED:
case EBuildingState::NO_RESOURCES:
{
auto res = town->town->buildings.at(BuildingID(bid))->resources;
return ah->whatToDo(res, iAmElementar()); //realize immediately or gather resources
}
break;
default:
throw cannotFulfillGoalException("Not possible to build");
}
}
else
@ -1137,11 +1142,9 @@ TGoalVec Goals::CollectRes::getAllPossibleSubgoals()
}
for (auto obj : ourObjs)
{
if (ai->isAccessibleForHero(obj->visitablePos(), h))
{
//further decomposition and evaluation will be handled by VisitObj
auto pos = obj->visitablePos();
if (ai->isTileNotReserved(h, pos)) //further decomposition and evaluation will be handled by VisitObj
ret.push_back(sptr(Goals::VisitObj(obj->id.getNum()).sethero(h).setisAbstract(true)));
}
}
}
return ret;
@ -1227,7 +1230,7 @@ TSubgoal Goals::CollectRes::whatToDoToTrade()
else //either it's our town, or we have hero there
{
Goals::Trade trade(resID, value, objid);
return sptr(trade.setisElementar(true)); //we can do this immediately - highest priority
return sptr(trade.setisElementar(true)); //we can do this immediately
}
}
}
@ -1454,7 +1457,7 @@ TGoalVec Goals::Build::getAllPossibleSubgoals()
}
if (ret.empty())
throw cannotFulfillGoalException("BUILD has been realized as much as possible."); //who catches it and what for?
throw cannotFulfillGoalException("BUILD has been realized as much as possible.");
else
return ret;
}
@ -1522,7 +1525,9 @@ TGoalVec GatherArmy::getAllPossibleSubgoals()
}
}
//build dwelling
auto bid = ah->canBuildAnyStructure(t, std::vector<BuildingID>(unitsSource, unitsSource + ARRAY_COUNT(unitsSource)), 8 - cb->getDate(Date::DAY_OF_WEEK));
//TODO: plan building over multiple turns?
//auto bid = ah->canBuildAnyStructure(t, std::vector<BuildingID>(unitsSource, unitsSource + ARRAY_COUNT(unitsSource)), 8 - cb->getDate(Date::DAY_OF_WEEK));
auto bid = ah->canBuildAnyStructure(t, std::vector<BuildingID>(unitsSource, unitsSource + ARRAY_COUNT(unitsSource)), 1);
if (bid.is_initialized())
{
auto goal = sptr(BuildThis(bid.get(), t).setpriority(priority));

2
AI/VCAI/Goals.h
View File

@ -432,7 +432,7 @@ public:
resID = rid;
value = val;
objid = Objid;
priority = 10; //do it immediately
priority = 3; //trading is instant, but picking resources is free
}
TSubgoal whatToDoToAchieve() override;
bool operator==(AbstractGoal & g) override;

7
AI/VCAI/VCAI.cpp
View File

@ -2123,15 +2123,14 @@ void VCAI::tryRealize(Goals::Trade & g) //trade
int toGive, toGet;
m->getOffer(res, g.resID, toGive, toGet, EMarketMode::RESOURCE_RESOURCE);
toGive = toGive * (it->resVal / toGive);
toGive = toGive * (it->resVal / toGive); //round down
//TODO trade only as much as needed
if (toGive) //don't try to sell 0 resources
{
cb->trade(obj, EMarketMode::RESOURCE_RESOURCE, res, g.resID, toGive);
logAi->debug("Traded %d of %s for %d of %s at %s", toGive, res, toGet, g.resID, obj->getObjectName());
accquiredResources += toGet; //FIXME: this is incorrect, always equal to 1
accquiredResources = toGet * (it->resVal / toGive);
logAi->debug("Traded %d of %s for %d of %s at %s", toGive, res, accquiredResources, g.resID, obj->getObjectName());
}
//if (accquiredResources >= g.value)
if (ah->freeResources()[g.resID] >= g.value)
throw goalFulfilledException(sptr(g)); //we traded all we needed
}