1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00

* minor fixes for revision 2193 (no shooting penalty bonus wasn't needed indeed but was poorly removed)

* minor changes
This commit is contained in:
mateuszb
2011-06-22 12:44:28 +00:00
parent d2d5930b64
commit c71127809e
7 changed files with 49 additions and 11 deletions

View File

@ -607,10 +607,11 @@ TDmgRange BattleInfo::calculateDmgRange( const CStack* attacker, const CStack* d
};
//wall / distance penalty + advanced air shield
if (shooting && !NBonus::hasOfType(attackerHero, Bonus::NO_DISTANCE_PENALTY) && (
hasDistancePenalty(attacker, defender->position) || hasWallPenalty(attacker, defender->position) ||
HLP::hasAdvancedAirShield(defender) )
)
bool distPenalty = !NBonus::hasOfType(attackerHero, Bonus::NO_DISTANCE_PENALTY) &&
hasDistancePenalty(attacker, defender->position);
bool obstaclePenalty = !NBonus::hasOfType(attackerHero, Bonus::NO_OBSTACLES_PENALTY) &&
hasWallPenalty(attacker, defender->position);
if (shooting && (distPenalty || obstaclePenalty || HLP::hasAdvancedAirShield(defender) ))
{
multBonus *= 0.5;
}