games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-29 00:41:38 +02:00
Code Issues Releases Activity

* Fixed bug #72

Browse Source 
* Implemented artifacts: Wizard's Well, Ring of the Magi, Cornucopia.
* Partially implemented artifacts: Armageddon's Blade,  Angelic Alliance, Cloak of the Undead King, Armor of the Damned, Power of the Dragon Father, Titan's Thunder, Admiral's Hat, Bow of the Sharpshooter.
Most of these only have their bonuses set.
* Updated AUTHORS
This commit is contained in:
OnionKnight
2009-08-21 19:31:41 +00:00
parent f4743d2fc6
commit 9bc40f1a8d
6 changed files with 110 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/CGameState.cpp
View File

@ -400,7 +400,7 @@ std::vector<int> BattleInfo::getAccessibility(int stackID, bool addOccupiable)
}
}
for(int i=0; i < BFIELD_SIZE ; ++i)
for (int i=0; i < BFIELD_SIZE ; ++i) {
if(
( ( !addOccupiable && dist[i] <= s->Speed() && ac[i] ) || ( addOccupiable && dist[i] <= s->Speed() && isAccessible(i, ac, s->hasFeatureOfType(StackFeature::DOUBLE_WIDE), s->attackerOwned, s->hasFeatureOfType(StackFeature::FLYING), true) ) )//we can reach it
|| (vstd::contains(occupyable, i) && ( dist[ i + (s->attackerOwned ? 1 : -1 ) ] <= s->Speed() ) &&
@ -409,6 +409,21 @@ std::vector<int> BattleInfo::getAccessibility(int stackID, bool addOccupiable)
{
ret.push_back(i);
}
}
// 2-hex creatures should not be able to move to a hex with an inaccesible hex to the left or right
// at the horizontal edges of the battlefield.
if (s->hasFeatureOfType(StackFeature::DOUBLE_WIDE)) {
int i = 0;
while (i < ret.size()) {
if (ret[i]%BFIELD_WIDTH == 1 && ret[i] + 1 != ret[i + 1])
ret.erase(ret.begin() + i);
else if (ret[i]%BFIELD_WIDTH == BFIELD_WIDTH - 1 && (i == 0 || ret[i] - 1 != ret[i - 1]))
ret.erase(ret.begin() + i);
else
i++;
}
}
return ret;
}