Merge pull request #584 from ninjatao/water_defense

Embarked civilian units should have no defense.
This commit is contained in:
Yair Morgenstern 2019-03-17 13:30:46 +02:00 committed by GitHub
commit 1004f1aaca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,7 +26,7 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant {
}
override fun getDefendingStrength(): Int {
if(unit.isEmbarked()) return 5 * getCivInfo().getEra().ordinal
if(unit.isEmbarked() && !unit.type.isCivilian()) return 5 * getCivInfo().getEra().ordinal
return unit.baseUnit().strength
}