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

Allow mapUnitFilter to use CivFilter instead of NationFilter (#10879)

Browse Source
This commit is contained in:
SeventhM
2024-01-07 06:08:01 -08:00
committed by GitHub
parent 9ae782b426
commit 3fefeb2e24
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,7 +545,7 @@ class MapUnit : IsPartOfGameInfoSerialization {
"Non-City" -> true
else -> {
if (baseUnit.matchesFilter(filter)) return true
if (civ.nation.matchesFilter(filter)) return true
if (civ.matchesFilter(filter)) return true
if (tempUniquesMap.containsKey(filter)) return true
return false
}

1
core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt
View File

@ -100,6 +100,7 @@ enum class UniqueParameterType(
override fun isKnownValue(parameterText:String, ruleset: Ruleset): Boolean {
if (parameterText in knownValues) return true
if (ruleset.unitPromotions.values.any { it.hasUnique(parameterText) }) return true
if (CivFilter.isKnownValue(parameterText, ruleset)) return true
if (BaseUnitFilter.isKnownValue(parameterText, ruleset)) return true
return false
}