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

Resolved another crash caused by incorrect ruleset mod definitions

Browse Source
This commit is contained in:
Yair Morgenstern 2020-10-19 23:24:53 +03:00
parent bd810d3d0c
commit c7b1121fe4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -115,8 +115,7 @@ class Nation : INamed {
private fun addUniqueBuildingsText(textList: ArrayList<String>, ruleset: Ruleset) { private fun addUniqueBuildingsText(textList: ArrayList<String>, ruleset: Ruleset) {
for (building in ruleset.buildings.values for (building in ruleset.buildings.values
.filter { it.uniqueTo == name && "Will not be displayed in Civilopedia" !in it.uniques}) { .filter { it.uniqueTo == name && "Will not be displayed in Civilopedia" !in it.uniques}) {
if (building.replaces == null) textList += building.getShortDescription(ruleset) if (building.replaces != null && ruleset.buildings.containsKey(building.replaces!!)) {
else {
val originalBuilding = ruleset.buildings[building.replaces!!]!! val originalBuilding = ruleset.buildings[building.replaces!!]!!
textList += building.name.tr() + " - " + "Replaces [${originalBuilding.name}]".tr() textList += building.name.tr() + " - " + "Replaces [${originalBuilding.name}]".tr()
@ -136,7 +135,9 @@ class Nation : INamed {
if (building.cityHealth != originalBuilding.cityHealth) if (building.cityHealth != originalBuilding.cityHealth)
textList += " {City health} " + "[${building.cityHealth}] vs [${originalBuilding.cityHealth}]".tr() textList += " {City health} " + "[${building.cityHealth}] vs [${originalBuilding.cityHealth}]".tr()
textList += "" textList += ""
} } else if (building.replaces != null) {
textList += building.name.tr() + " - " + "Replaces [${building.replaces}], which is not found in the ruleset!".tr()
} else textList += building.getShortDescription(ruleset)
} }
} }