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

Added tests for parameters for complex filters, fixed nested complex filter returning 'possible filtering' when it should have been known

Browse Source
This commit is contained in:
Yair Morgenstern
2023-11-19 00:06:34 +02:00
parent 92d181d282
commit fb1e57668e
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/MultiFilter.kt
View File

@ -5,7 +5,7 @@ object MultiFilter {
/** Unique validity doesn't check for actual matching */ forUniqueValidityTests:Boolean=false): Boolean {
if (input.contains("} {"))
return input.removePrefix("{").removeSuffix("}").split("} {")
.all{ multiFilter(it, filterFunction) }
.all{ multiFilter(it, filterFunction, forUniqueValidityTests) }
if (input.startsWith("non-[") && input.endsWith("]")) {
val internalResult = multiFilter(input.removePrefix("non-[").removeSuffix("]"), filterFunction)
return if (forUniqueValidityTests) internalResult else !internalResult