games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-25 12:14:46 +02:00
Code Issues Releases Activity

Fixed issues with exchanging combo artifacts (#2132).

Browse Source
This commit is contained in:
DjWarmonger 2015-08-30 15:15:04 +02:00
parent 6af8db2c69
commit 2012d53dd6
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AI/VCAI/VCAI.cpp
View File

@ -1034,7 +1034,7 @@ void VCAI::pickBestArtifacts(const CGHeroInstance * h, const CGHeroInstance * ot
continue; //don't reequip artifact we already wear continue; //don't reequip artifact we already wear
auto s = location.getSlot(); auto s = location.getSlot();
if (!s) if (!s || s->locked) //we can't move locks
continue; continue;
auto artifact = s->artifact; auto artifact = s->artifact;
if (!artifact) if (!artifact)
@ -1044,9 +1044,10 @@ void VCAI::pickBestArtifacts(const CGHeroInstance * h, const CGHeroInstance * ot
bool emptySlotFound = false; bool emptySlotFound = false;
for (auto slot : artifact->artType->possibleSlots.at(target->bearerType())) for (auto slot : artifact->artType->possibleSlots.at(target->bearerType()))
{ {
if (target->isPositionFree(slot)) ArtifactLocation destLocation(target, slot);
if (target->isPositionFree(slot) && artifact->canBePutAt(destLocation, true)) //combined artifacts are not always allowed to move
{ {
cb->swapArtifacts(location, ArtifactLocation(target, slot)); //just put into empty slot cb->swapArtifacts(location, destLocation); //just put into empty slot
emptySlotFound = true; emptySlotFound = true;
changeMade = true; changeMade = true;
break; break;
@ -1059,7 +1060,9 @@ void VCAI::pickBestArtifacts(const CGHeroInstance * h, const CGHeroInstance * ot
auto otherSlot = target->getSlot(slot); auto otherSlot = target->getSlot(slot);
if (otherSlot && otherSlot->artifact) //we need to exchange artifact for better one if (otherSlot && otherSlot->artifact) //we need to exchange artifact for better one
{ {
if (compareArtifacts(artifact, otherSlot->artifact)) //if that artifact is better than what we have, pick it ArtifactLocation destLocation(target, slot);
//if that artifact is better than what we have, pick it
if (compareArtifacts(artifact, otherSlot->artifact) && artifact->canBePutAt(destLocation, true)) //combined artifacts are not always allowed to move
{ {
cb->swapArtifacts(location, ArtifactLocation(target, target->getArtPos(otherSlot->artifact))); cb->swapArtifacts(location, ArtifactLocation(target, target->getArtPos(otherSlot->artifact)));
break; break;
@ -1842,7 +1845,10 @@ bool VCAI::moveHeroToTile(int3 dst, HeroPtr h)
auto getObj = [&](int3 coord, bool ignoreHero) auto getObj = [&](int3 coord, bool ignoreHero)
{ {
return cb->getTile(coord,false)->topVisitableObj(ignoreHero); auto tile = cb->getTile(coord, false);
assert(tile);
return tile->topVisitableObj(ignoreHero);
//return cb->getTile(coord,false)->topVisitableObj(ignoreHero);
}; };
auto doMovement = [&](int3 dst, bool transit) auto doMovement = [&](int3 dst, bool transit)