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

Fix Zone of Control (#6891)

Browse Source
This commit is contained in:
itanasi 2022-05-21 06:24:18 -07:00 committed by GitHub
parent 915f3e694f
commit 8b9946e65e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ class UnitMovementAlgorithms(val unit: MapUnit) {
yield(tile) yield(tile)
} }
else if (tile.militaryUnit != null && civInfo.isAtWarWith(tile.militaryUnit!!.civInfo)) { else if (tile.militaryUnit != null && civInfo.isAtWarWith(tile.militaryUnit!!.civInfo)) {
if (tile.militaryUnit!!.type.isWaterUnit() || (unit.type.isLandUnit() && tile.militaryUnit!!.isEmbarked())) if (tile.militaryUnit!!.type.isWaterUnit() || (unit.type.isLandUnit() && !tile.militaryUnit!!.isEmbarked()))
yield(tile) yield(tile)
} }
} }
@ -126,7 +126,6 @@ class UnitMovementAlgorithms(val unit: MapUnit) {
// anyway. // anyway.
if (unit.ignoresZoneOfControl) if (unit.ignoresZoneOfControl)
return false return false
return true return true
} }