games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

* minor bugfixes

Browse Source
This commit is contained in:
mateuszb 2009-04-07 17:51:50 +00:00
parent ee61a02d12
commit b74b6ecc01
2 changed files with 80 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AI/GeniusAI/CGeniusAI.cpp
View File

@ -855,7 +855,16 @@ BattleAction CBattleLogic::MakeAttack(int attackerID, int destinationID)
//ba.actionType = 6; // go and attack
ba.stackNumber = attackerID;
ba.destinationTile = (ui16)dest_tile;
ba.additionalInfo = m_cb->battleGetPos(destinationID);
//simplified checking for possibility of attack (previous was too simplified)
int destStackPos = m_cb->battleGetPos(destinationID);
if(BattleInfo::mutualPosition(dest_tile, destStackPos) != -1)
ba.additionalInfo = destStackPos;
else if(BattleInfo::mutualPosition(dest_tile, destStackPos+1) != -1)
ba.additionalInfo = destStackPos+1;
else if(BattleInfo::mutualPosition(dest_tile, destStackPos-1) != -1)
ba.additionalInfo = destStackPos-1;
else
MakeDefend(attackerID);
int nearest_dist = m_battleHelper.InfiniteDistance;
int nearest_pos = -1;

84
CBattleInterface.cpp
View File

@ -1552,13 +1552,41 @@ void CBattleInterface::hexLclicked(int whichOne)
{
switch(CGI->curh->number)
{
case 12:
giveCommand(6,whichOne + ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH : BFIELD_WIDTH+1 ),activeStack,whichOne);
break;
case 7:
giveCommand(6,whichOne + ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH-1 : BFIELD_WIDTH ),activeStack,whichOne);
break;
case 8:
case 12: //from bottom right
{
int destHex = whichOne + ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH : BFIELD_WIDTH+1 );
if(vstd::contains(shadedHexes, destHex))
giveCommand(6,destHex,activeStack,whichOne);
else if(attackingHeroInstance->tempOwner == LOCPLINT->cb->getMyColor()) //if we are attacker
{
if(vstd::contains(shadedHexes, destHex+1))
giveCommand(6,destHex+1,activeStack,whichOne);
}
else //if we are defneder
{
if(vstd::contains(shadedHexes, destHex-1))
giveCommand(6,destHex-1,activeStack,whichOne);
}
break;
}
case 7: //from bottom left
{
int destHex = whichOne + ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH-1 : BFIELD_WIDTH );
if(vstd::contains(shadedHexes, destHex))
giveCommand(6,destHex,activeStack,whichOne);
else if(attackingHeroInstance->tempOwner == LOCPLINT->cb->getMyColor()) //if we are attacker
{
if(vstd::contains(shadedHexes, destHex+1))
giveCommand(6,destHex+1,activeStack,whichOne);
}
else //if we are defneder
{
if(vstd::contains(shadedHexes, destHex-1))
giveCommand(6,destHex-1,activeStack,whichOne);
}
break;
}
case 8: //from left
if(LOCPLINT->cb->battleGetStackByID(activeStack)->creature->isDoubleWide() && !LOCPLINT->cb->battleGetStackByID(activeStack)->attackerOwned)
{
std::vector<int> acc = LOCPLINT->cb->battleGetAvailableHexes(activeStack, false);
@ -1572,13 +1600,41 @@ void CBattleInterface::hexLclicked(int whichOne)
giveCommand(6,whichOne - 1,activeStack,whichOne);
}
break;
case 9:
giveCommand(6,whichOne - ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH+1 : BFIELD_WIDTH ),activeStack,whichOne);
break;
case 10:
giveCommand(6,whichOne - ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH : BFIELD_WIDTH-1 ),activeStack,whichOne);
break;
case 11:
case 9: //from top left
{
int destHex = whichOne - ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH+1 : BFIELD_WIDTH );
if(vstd::contains(shadedHexes, destHex))
giveCommand(6,destHex,activeStack,whichOne);
else if(attackingHeroInstance->tempOwner == LOCPLINT->cb->getMyColor()) //if we are attacker
{
if(vstd::contains(shadedHexes, destHex+1))
giveCommand(6,destHex+1,activeStack,whichOne);
}
else //if we are defneder
{
if(vstd::contains(shadedHexes, destHex-1))
giveCommand(6,destHex-1,activeStack,whichOne);
}
break;
}
case 10: //from top right
{
int destHex = whichOne - ( (whichOne/BFIELD_WIDTH)%2 ? BFIELD_WIDTH : BFIELD_WIDTH-1 );
if(vstd::contains(shadedHexes, destHex))
giveCommand(6,destHex,activeStack,whichOne);
else if(attackingHeroInstance->tempOwner == LOCPLINT->cb->getMyColor()) //if we are attacker
{
if(vstd::contains(shadedHexes, destHex+1))
giveCommand(6,destHex+1,activeStack,whichOne);
}
else //if we are defneder
{
if(vstd::contains(shadedHexes, destHex-1))
giveCommand(6,destHex-1,activeStack,whichOne);
}
break;
}
case 11: //from right
if(LOCPLINT->cb->battleGetStackByID(activeStack)->creature->isDoubleWide() && LOCPLINT->cb->battleGetStackByID(activeStack)->attackerOwned)
{
std::vector<int> acc = LOCPLINT->cb->battleGetAvailableHexes(activeStack, false);