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

Fixed tests

Browse Source
This commit is contained in:
yairm210
2021-10-20 23:18:03 +03:00
parent 60f0724b42
commit 24f3e784fa
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,10 +188,17 @@ enum class UniqueParameterType(val parameterName:String) {
}, },
BeliefTypeName("beliefType") { BeliefTypeName("beliefType") {
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset): override fun getErrorSeverity(parameterText: String, ruleset: Ruleset):
UniqueType.UniqueComplianceErrorSeverity? = when (parameterText) { UniqueType.UniqueComplianceErrorSeverity? = when (parameterText) {
in BeliefType.values().map { it.name } -> null in BeliefType.values().map { it.name } -> null
else -> UniqueType.UniqueComplianceErrorSeverity.RulesetInvariant else -> UniqueType.UniqueComplianceErrorSeverity.RulesetInvariant
} }
},
Belief("belief") {
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset):
UniqueType.UniqueComplianceErrorSeverity? = when (parameterText) {
in ruleset.beliefs -> null
else -> UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific
}
}, },
FoundingOrEnhancing("foundingOrEnhancing") { FoundingOrEnhancing("foundingOrEnhancing") {
private val knownValues = setOf("founding", "enhancing") private val knownValues = setOf("founding", "enhancing")

2
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -76,7 +76,7 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget) {
StatsSpendingGreatPeople("[stats] whenever a Great Person is expended", UniqueTarget.Global), StatsSpendingGreatPeople("[stats] whenever a Great Person is expended", UniqueTarget.Global),
StatsFromTiles("[stats] from [tileFilter] tiles [cityFilter]", UniqueTarget.Global), StatsFromTiles("[stats] from [tileFilter] tiles [cityFilter]", UniqueTarget.Global),
// This is a doozy // This is a doozy
StatsFromObject("[stats] from every [tileFilter/specialist/buildingNam]", UniqueTarget.Global), StatsFromObject("[stats] from every [tileFilter/specialist/buildingName/belief]", UniqueTarget.Global),
StatPercentBonus("[amount]% [stat]", UniqueTarget.Global), StatPercentBonus("[amount]% [stat]", UniqueTarget.Global),
BonusStatsFromCityStates("[amount]% [stat] from City-States", UniqueTarget.Global), BonusStatsFromCityStates("[amount]% [stat] from City-States", UniqueTarget.Global),