From 9c7e18e44d7734a3752e6261884508822c8b3a6e Mon Sep 17 00:00:00 2001 From: mateuszb Date: Fri, 7 May 2010 12:40:56 +0000 Subject: [PATCH] * melee penalty and NO_MELEE_PENALTY implemented --- lib/CGameState.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/CGameState.cpp b/lib/CGameState.cpp index 4c30629f9..eab680851 100644 --- a/lib/CGameState.cpp +++ b/lib/CGameState.cpp @@ -2572,6 +2572,10 @@ std::pair BattleInfo::calculateDmgRange( const CStack* attacker, con { multBonus *= 0.5; } + if (!shooting && attacker->hasBonusOfType(Bonus::SHOOTER) && !attacker->hasBonusOfType(Bonus::NO_MELEE_PENALTY)) + { + multBonus *= 0.5; + } minDmg *= additiveBonus * multBonus; maxDmg *= additiveBonus * multBonus;