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

Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions (#1754)

Browse Source 
* Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions

* Template for the translation strings

* New icons are added

Co-authored-by: ltrcao <ltrcao@users.noreply.github.com>
This commit is contained in:
JackRainy
2020-01-25 19:43:53 +02:00
committed by Yair Morgenstern
parent b21fdc6c37
commit e0a00eb9a5
8 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,6 +166,9 @@ class BattleDamage{
if (defenceVsRanged > 0) modifiers["defence vs ranged"] = defenceVsRanged
}
val carrierDefenceBonus = 0.25f * defender.unit.getUniques().count { it == "+25% Combat Bonus when defending" }
if (carrierDefenceBonus > 0) modifiers["Armor Plating"] = carrierDefenceBonus
if (defender.unit.isFortified())
modifiers["Fortification"] = 0.2f * defender.unit.getFortificationTurns()

2
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -297,7 +297,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
val unitAtDestination = tile.militaryUnit!!
var unitCapacity = if (unitAtDestination.getUniques().contains("Can carry 2 aircraft")) 2 else 0
// unitCapacity += unitAtDestination.getUniques().count { it == "Can carry 1 extra air unit" }
unitCapacity += unitAtDestination.getUniques().count { it == "Can carry 1 extra air unit" }
return ((unitAtDestination.type.isAircraftCarrierUnit() && !unit.type.isMissileUnit()) ||
(unitAtDestination.type.isMissileCarrierUnit() && unit.type.isMissileUnit()))