From 16893ced68ce5171d8b667f1545bf8d149a8b917 Mon Sep 17 00:00:00 2001 From: Why-not-now <81090788+Why-not-now@users.noreply.github.com> Date: Thu, 14 Dec 2023 04:35:51 +0800 Subject: [PATCH] Added check for belief.type (#10711) * Added check for belief.type * Removed check for BeliefType.None Not needed if check beforehand checks for it * Update RulesetValidator.kt * Update Belief.kt * Update Belief.kt --- .../com/unciv/models/ruleset/validation/RulesetValidator.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt b/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt index 65b2c8d502..1f4c7d2e7b 100644 --- a/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt +++ b/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt @@ -8,6 +8,7 @@ import com.unciv.json.fromJsonFile import com.unciv.json.json import com.unciv.logic.map.tile.RoadStatus import com.unciv.models.metadata.BaseRuleset +import com.unciv.models.ruleset.BeliefType import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache @@ -230,6 +231,8 @@ class RulesetValidator(val ruleset: Ruleset) { tryFixUnknownUniques: Boolean ) { for (belief in ruleset.beliefs.values) { + if (belief.type == BeliefType.Any || belief.type == BeliefType.None) + lines += "${belief.name} type is {belief.type}, which is not allowed!" uniqueValidator.checkUniques(belief, lines, true, tryFixUnknownUniques) } }