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

Allow multifilter uniques to count for filtering

Browse Source
This commit is contained in:
Yair Morgenstern 2024-03-03 21:51:15 +02:00
parent 0cfee86864
commit abc876f4a1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/models/ruleset/validation/UniqueValidator.kt
View File

@ -15,14 +15,20 @@ import com.unciv.models.ruleset.unique.UniqueType
class UniqueValidator(val ruleset: Ruleset) { class UniqueValidator(val ruleset: Ruleset) {
/** Used to determine if certain uniques are used for filtering */
private val allNonTypedUniques = HashSet<String>() private val allNonTypedUniques = HashSet<String>()
/** Used to determine if certain uniques are used for filtering */
private val allUniqueParameters = HashSet<String>() private val allUniqueParameters = HashSet<String>()
private fun addToHashsets(uniqueHolder: IHasUniques) { private fun addToHashsets(uniqueHolder: IHasUniques) {
for (unique in uniqueHolder.uniqueObjects) { for (unique in uniqueHolder.uniqueObjects) {
if (unique.type == null) allNonTypedUniques.add(unique.text) if (unique.type == null) allNonTypedUniques.add(unique.text)
else allUniqueParameters.addAll(unique.allParams) else allUniqueParameters.addAll(unique.allParams.flatMap {
// Multifilters have the actual filtering uniques
it.removePrefix("{").removeSuffix("}").split("} {")}
// Non-filters
.map { if (it.startsWith("non-[")) {it.removePrefix("non-[").removeSuffix("]")} else it }
)
} }
} }