mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-09 04:09:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #622 from B5656/patch-5

Browse Source 
Update BattleDamage.kt
This commit is contained in:
Yair Morgenstern 2019-04-01 16:20:53 +03:00 committed by GitHub
commit 19a78587de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/battle/BattleDamage.kt
View File

@ -49,8 +49,9 @@ class BattleDamage{
if (combatant.getCivInfo().happiness < 0)
modifiers["Unhappiness"] = max(0.02f * combatant.getCivInfo().happiness,-0.9f) // otherwise it could exceed -100% and start healing enemy units...
if(combatant.getCivInfo().policies.isAdopted("Populism"))
if(combatant.getCivInfo().policies.isAdopted("Populism") && combatant.getHealth() < 100){
modifiers["Populism"] = 0.25f
}
if(combatant.getCivInfo().policies.isAdopted("Discipline") && combatant.isMelee()
&& combatant.getTile().neighbors.flatMap { it.getUnits() }
@ -215,4 +216,4 @@ class BattleDamage{
val ratio = getAttackingStrength(attacker,defender) / getDefendingStrength(attacker,defender)
return (ratio * 30 * getHealthDependantDamageRatio(attacker)).toInt()
}
}
}