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

improvementFilter accepts uniques as well

Browse Source
This commit is contained in:
Yair Morgenstern 2022-04-20 09:37:00 +03:00
parent bd41630f84
commit c5c06a2456
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/models/ruleset/tile/TileImprovement.kt
View File

@ -83,6 +83,7 @@ class TileImprovement : RulesetStatsObject() {
"All" -> true
"All Road" -> isRoad()
"Great Improvement", "Great" -> isGreatImprovement()
in uniques -> true
else -> false
}
}

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

@ -341,7 +341,9 @@ enum class UniqueParameterType(
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset):
UniqueType.UniqueComplianceErrorSeverity? {
if (parameterText in knownValues) return null
return ImprovementName.getErrorSeverity(parameterText, ruleset)
if (ImprovementName.getErrorSeverity(parameterText, ruleset) == null) return null
if (ruleset.tileImprovements.values.any { it.hasUnique(parameterText) }) return null
return UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific
}
override fun isTranslationWriterGuess(parameterText: String, ruleset: Ruleset) =
parameterText != "All" && getErrorSeverity(parameterText, ruleset) == null