mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-03 12:54:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

Adjacent unit filter takes civilians into account

Browse Source
This commit is contained in:
Yair Morgenstern 2024-04-28 15:02:22 +03:00
parent b5fd2557d6
commit 95b176f4e5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/models/ruleset/unique/Conditionals.kt
View File

@ -293,14 +293,15 @@ object Conditionals {
)
}
UniqueType.ConditionalAdjacentUnit ->
relevantCiv != null
&& relevantUnit != null
&& relevantTile!!.neighbors.any {
it.militaryUnit != null
&& it.militaryUnit != relevantUnit
&& it.militaryUnit!!.civ == relevantCiv
&& it.militaryUnit!!.matchesFilter(condition.params[0])
}
relevantCiv != null &&
relevantUnit != null &&
relevantTile!!.neighbors.any {
it.getUnits().any {
it != relevantUnit &&
it.civ == relevantCiv &&
it.matchesFilter(condition.params[0])
}
}
UniqueType.ConditionalNeighborTiles ->
relevantTile != null