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

Game no longer crashes due to incorrect building-improvement modding combinations

Browse Source
This commit is contained in:
Yair Morgenstern
2021-03-13 22:35:24 +02:00
parent b658e04048
commit 5564d4db7e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,7 +469,7 @@ class Building : NamedStats(), IConstruction {
val improvementUnique = uniqueObjects
.firstOrNull { it.placeholderText == "Creates a [] improvement on a specific tile" }
if (improvementUnique == null) return null
return ruleset.tileImprovements[improvementUnique.params[0]]!!
return ruleset.tileImprovements[improvementUnique.params[0]]
}
fun isSellable() = !isWonder && !isNationalWonder && !uniques.contains("Unsellable")

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

@ -278,6 +278,9 @@ class Ruleset {
lines += "${building.name} requires ${building.requiredBuildingInAllCities} in all cities which does not exist!"
if (building.providesFreeBuilding != null && !buildings.containsKey(building.providesFreeBuilding!!))
lines += "${building.name} provides a free ${building.providesFreeBuilding} which does not exist!"
for (unique in building.uniqueObjects)
if (unique.placeholderText == "Creates a [] improvement on a specific tile" && !tileImprovements.containsKey(unique.params[0]))
lines += "${building.name} creates a ${unique.params[0]} improvement which does not exist!"
}
for (resource in tileResources.values) {