Merge updates from the nightly branch #34

Merged
Exynox merged 73 commits from nightly into master 2024-11-16 18:17:14 +02:00
Showing only changes of commit 8360d6939f - Show all commits

View File

@ -2040,16 +2040,7 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
// 다른 제국 사람인 경우 데미지 10% 감소
if (iEmpire && iMapEmpire && iEmpire != iMapEmpire)
{
int percent = 10;
if (184 <= lMapIndex && lMapIndex <= 189)
{
percent = 9;
}
else
{
percent = 9;
}
const int percent = 9;
dam = dam * percent / 10;
}