From 24f3e784faf8587da591fbb88386e37cce3153e8 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Wed, 20 Oct 2021 23:18:03 +0300 Subject: [PATCH] Fixed tests --- .../models/ruleset/unique/UniqueParameterType.kt | 15 +++++++++++---- .../com/unciv/models/ruleset/unique/UniqueType.kt | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index 19fe1dd565..a115b74053 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -188,10 +188,17 @@ enum class UniqueParameterType(val parameterName:String) { }, BeliefTypeName("beliefType") { override fun getErrorSeverity(parameterText: String, ruleset: Ruleset): - UniqueType.UniqueComplianceErrorSeverity? = when (parameterText) { - in BeliefType.values().map { it.name } -> null - else -> UniqueType.UniqueComplianceErrorSeverity.RulesetInvariant - } + UniqueType.UniqueComplianceErrorSeverity? = when (parameterText) { + in BeliefType.values().map { it.name } -> null + 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") { private val knownValues = setOf("founding", "enhancing") diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 9ecefbd583..13caa4b9b1 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -76,7 +76,7 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget) { StatsSpendingGreatPeople("[stats] whenever a Great Person is expended", UniqueTarget.Global), StatsFromTiles("[stats] from [tileFilter] tiles [cityFilter]", UniqueTarget.Global), // 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), BonusStatsFromCityStates("[amount]% [stat] from City-States", UniqueTarget.Global),