AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Embarked units now have era-based defensive strength (like in original civ)

Browse Source
This commit is contained in:
Yair Morgenstern 2019-02-09 23:06:13 +02:00
parent d9fb3fdb2c
commit ae7cbcb3c9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,11 @@ class BattleDamage{
} }
fun getDefenceModifiers(attacker: ICombatant, defender: MapUnitCombatant): HashMap<String, Float> { fun getDefenceModifiers(attacker: ICombatant, defender: MapUnitCombatant): HashMap<String, Float> {
if(defender.unit.isEmbarked()) // embarked units get no defensive modifiers
return HashMap()
val modifiers = getGeneralModifiers(defender, attacker) val modifiers = getGeneralModifiers(defender, attacker)
if (!(defender.unit.hasUnique("No defensive terrain bonus"))) { if (!(defender.unit.hasUnique("No defensive terrain bonus"))) {
val tileDefenceBonus = defender.getTile().getDefensiveBonus() val tileDefenceBonus = defender.getTile().getDefensiveBonus()
if (tileDefenceBonus > 0) modifiers["Terrain"] = tileDefenceBonus if (tileDefenceBonus > 0) modifiers["Terrain"] = tileDefenceBonus

2
core/src/com/unciv/logic/battle/MapUnitCombatant.kt
View File

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