AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 15:01:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Can handle and detect mods where the requiredBuildingInAllRuleset does not exist in the ruleset

Browse Source
This commit is contained in:
Yair Morgenstern 2021-01-16 21:22:15 +02:00
parent b27c744cd2
commit 245e7de0a1
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,6 +307,8 @@ class Building : NamedStats(), IConstruction {
if (isNationalWonder) { if (isNationalWonder) {
if (civInfo.cities.any { it.cityConstructions.isBuilt(name) }) if (civInfo.cities.any { it.cityConstructions.isBuilt(name) })
return "National Wonder is already built" return "National Wonder is already built"
if (requiredBuildingInAllCities != null && civInfo.gameInfo.ruleSet.buildings[requiredBuildingInAllCities!!] == null)
return "Required building in all cities does not exist in the ruleset!"
if (requiredBuildingInAllCities != null if (requiredBuildingInAllCities != null
&& civInfo.cities.any { && civInfo.cities.any {
!it.isPuppet && !it.cityConstructions !it.isPuppet && !it.cityConstructions

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

@ -273,6 +273,8 @@ class Ruleset {
lines += "${building.name} replaces ${building.replaces} which does not exist!" lines += "${building.name} replaces ${building.replaces} which does not exist!"
if (building.requiredBuilding != null && !buildings.containsKey(building.requiredBuilding!!)) if (building.requiredBuilding != null && !buildings.containsKey(building.requiredBuilding!!))
lines += "${building.name} requires ${building.requiredBuilding} which does not exist!" lines += "${building.name} requires ${building.requiredBuilding} which does not exist!"
if (building.requiredBuildingInAllCities != null && !buildings.containsKey(building.requiredBuildingInAllCities!!))
lines += "${building.name} requires ${building.requiredBuildingInAllCities} in all cities which does not exist!"
} }
for (resource in tileResources.values) { for (resource in tileResources.values) {