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

Revert "Mod checks against sellable, missing or multiple Palace(s) (#9516)"

Browse Source 
This reverts commit 2d02e69d24.
This commit is contained in:
Yair Morgenstern 2023-06-05 23:21:23 +03:00
parent f8e38b99f1
commit d2c0ce5229
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/models/ruleset/RulesetValidator.kt
View File

@ -62,10 +62,8 @@ class RulesetValidator(val ruleset: Ruleset) {
UniqueType.Unbuildable))
lines += "${building.name} is buildable and therefore must either have an explicit cost or reference an existing tech!"
if (building.hasUnique(UniqueType.IndicatesCapital) && !building.isAnyWonder() && !building.hasUnique(UniqueType.Unsellable))
lines += "${building.name} is a Capital indicator and therefore must either be a wonder or explicitly marked 'Unsellable'!"
checkUniques(building, lines, rulesetInvariant, tryFixUnknownUniques)
}
for (nation in ruleset.nations.values) {
@ -183,12 +181,6 @@ class RulesetValidator(val ruleset: Ruleset) {
checkUniques(unit, lines, rulesetSpecific, tryFixUnknownUniques)
}
when (ruleset.buildings.values.count { it.hasUnique(UniqueType.IndicatesCapital) }) {
0 -> lines += "No building indicating the Capital in ruleset!"
1 -> Unit
else -> lines.add("There is more than one building indicating the Capital in the ruleset!", RulesetErrorSeverity.Warning)
}
for (building in ruleset.buildings.values) {
if (building.requiredTech != null && !ruleset.technologies.containsKey(building.requiredTech!!))
lines += "${building.name} requires tech ${building.requiredTech} which does not exist!"
@ -344,7 +336,7 @@ class RulesetValidator(val ruleset: Ruleset) {
for (nation in ruleset.nations.values) {
checkUniques(nation, lines, rulesetSpecific, tryFixUnknownUniques)
if (nation.cityStateType != null && nation.cityStateType !in ruleset.cityStateTypes)
if (nation.cityStateType!=null && nation.cityStateType !in ruleset.cityStateTypes)
lines += "${nation.name} is of city-state type ${nation.cityStateType} which does not exist!"
if (nation.favoredReligion != null && nation.favoredReligion !in ruleset.religions)
lines += "${nation.name} has ${nation.favoredReligion} as their favored religion, which does not exist!"