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

Fixed a bug where crosshairs are everywhere with the 'attack when embarked' unique (#6507)

Browse Source
This commit is contained in:
Xander Lenstra 2022-04-08 11:26:45 +02:00 committed by GitHub
parent a2a8c0aab5
commit c45885c763
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/automation/BattleHelper.kt
View File

@ -91,9 +91,10 @@ object BattleHelper {
}
fun containsAttackableEnemy(tile: TileInfo, combatant: ICombatant): Boolean {
if (combatant is MapUnitCombatant && combatant.unit.isEmbarked()) {
if (combatant is MapUnitCombatant && combatant.unit.isEmbarked() && !combatant.hasUnique(UniqueType.AttackOnSea)) {
// Can't attack water units while embarked, only land
if (tile.isWater || combatant.isRanged()) return combatant.hasUnique(UniqueType.AttackOnSea)
if (tile.isWater || combatant.isRanged())
return false
}
val tileCombatant = Battle.getMapCombatantOfTile(tile) ?: return false