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

Game can handle ongoing constructions "disappearing" between mod versions

Browse Source
This commit is contained in:
Yair Morgenstern 2021-01-12 18:10:41 +02:00
parent a8e0f270a0
commit 088c716321
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/GameInfo.kt
View File

@ -347,12 +347,18 @@ class GameInfo {
if (!ruleSet.buildings.containsKey(building)) if (!ruleSet.buildings.containsKey(building))
city.cityConstructions.builtBuildings.remove(building) city.cityConstructions.builtBuildings.remove(building)
fun isInvalidConstruction(construction: String) = !ruleSet.buildings.containsKey(construction) && !ruleSet.units.containsKey(construction)
&& !PerpetualConstruction.perpetualConstructionsMap.containsKey(construction)
// Remove invalid buildings or units from the queue - don't just check buildings and units because it might be a special construction as well // Remove invalid buildings or units from the queue - don't just check buildings and units because it might be a special construction as well
for (construction in city.cityConstructions.constructionQueue.toList()) { for (construction in city.cityConstructions.constructionQueue.toList()) {
if (!ruleSet.buildings.containsKey(construction) && !ruleSet.units.containsKey(construction) if (isInvalidConstruction(construction))
&& !PerpetualConstruction.perpetualConstructionsMap.containsKey(construction))
city.cityConstructions.constructionQueue.remove(construction) city.cityConstructions.constructionQueue.remove(construction)
} }
// And from being in progess
for (construction in city.cityConstructions.inProgressConstructions.keys.toList())
if (isInvalidConstruction(construction))
city.cityConstructions.inProgressConstructions.remove(construction)
} }
for (civinfo in civilizations) { for (civinfo in civilizations) {
for (tech in civinfo.tech.techsResearched.toList()) for (tech in civinfo.tech.techsResearched.toList())