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

AI will not try to sell reserved resources.

Browse Source
This commit is contained in:
DJWarmonger 2018-08-04 11:51:19 +02:00
parent 2aa0a6fe2f
commit 9e34ef5534
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/VCAI/Goals.cpp
View File

@ -1086,7 +1086,7 @@ TSubgoal Goals::CollectRes::whatToDoToTrade()
int toGive = -1, toReceive = -1; int toGive = -1, toReceive = -1;
m->getOffer(i, resID, toGive, toReceive, EMarketMode::RESOURCE_RESOURCE); m->getOffer(i, resID, toGive, toReceive, EMarketMode::RESOURCE_RESOURCE);
assert(toGive > 0 && toReceive > 0); assert(toGive > 0 && toReceive > 0);
howManyCanWeBuy += toReceive * (cb->getResourceAmount(i) / toGive); howManyCanWeBuy += toReceive * (ah->freeResources()[i] / toGive);
} }
if (howManyCanWeBuy >= value) if (howManyCanWeBuy >= value)

18
AI/VCAI/VCAI.cpp
View File

@ -2171,20 +2171,22 @@ void VCAI::tryRealize(Goals::Trade & g) //trade
{ {
if(const IMarket * m = IMarket::castFrom(obj, false)) if(const IMarket * m = IMarket::castFrom(obj, false))
{ {
for(Res::ERes i = Res::WOOD; i <= Res::GOLD; vstd::advance(i, 1)) auto freeRes = ah->freeResources(); //trade only resources which are not reserved
for(auto it = Res::ResourceSet::nziterator(freeRes); it.valid(); it++)
{ {
if(i == g.resID) //sell any other resource auto res = it->resType;
if(res == g.resID) //sell any other resource
continue; continue;
//TODO: check all our reserved resources and avoid them
int toGive, toGet; int toGive, toGet;
m->getOffer(i, g.resID, toGive, toGet, EMarketMode::RESOURCE_RESOURCE); m->getOffer(res, g.resID, toGive, toGet, EMarketMode::RESOURCE_RESOURCE);
toGive = toGive * (cb->getResourceAmount(i) / toGive); toGive = toGive * (it->resVal / toGive);
//TODO trade only as much as needed //TODO trade only as much as needed
if (toGive) //don't try to sell 0 resources if (toGive) //don't try to sell 0 resources
{ {
cb->trade(obj, EMarketMode::RESOURCE_RESOURCE, i, g.resID, toGive); cb->trade(obj, EMarketMode::RESOURCE_RESOURCE, res, g.resID, toGive);
logAi->debug("Traded %d of %s for %d of %s at %s", toGive, i, toGet, g.resID, obj->getObjectName()); logAi->debug("Traded %d of %s for %d of %s at %s", toGive, res, toGet, g.resID, obj->getObjectName());
accquiredResources += toGet; accquiredResources += toGet; //FIXME: this is incorrect, always equal to 1
} }
if (accquiredResources >= g.value) //we traded all we needed if (accquiredResources >= g.value) //we traded all we needed
throw goalFulfilledException(sptr(g)); throw goalFulfilledException(sptr(g));