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

Resolved #9874 - free buildings are converted to civ-specific replacements

Browse Source
This commit is contained in:
Yair Morgenstern 2023-08-02 16:01:21 +03:00
parent bbf2f2ff89
commit 5e7f49dac8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/com/unciv/logic/civilization/CivConstructions.kt
View File

@ -104,21 +104,24 @@ class CivConstructions : IsPartOfGameInfoSerialization {
.mapValues { unique -> unique.value.sumOf { it.params[1].toInt() } } .mapValues { unique -> unique.value.sumOf { it.params[1].toInt() } }
for ((building, amount) in buildingsUniquesData) { for ((building, amount) in buildingsUniquesData) {
addFreeBuildings(building, amount) val civBuildingEquivalent = civInfo.getEquivalentBuilding(building)
addFreeBuildings(civBuildingEquivalent, amount)
} }
} }
private fun addFreeBuildings(building: String, amount: Int) { private fun addFreeBuildings(building: Building, amount: Int) {
for (city in civInfo.cities.take(amount)) { for (city in civInfo.cities.take(amount)) {
if (freeSpecificBuildingsProvided[building]?.contains(city.id) == true || city.cityConstructions.containsBuildingOrEquivalent(building)) continue if (freeSpecificBuildingsProvided[building.name]?.contains(city.id) == true
|| city.cityConstructions.containsBuildingOrEquivalent(building.name)) continue
(city.cityConstructions.getConstruction(building) as INonPerpetualConstruction).postBuildEvent(city.cityConstructions) building.postBuildEvent(city.cityConstructions)
if (!freeSpecificBuildingsProvided.containsKey(building)) if (!freeSpecificBuildingsProvided.containsKey(building.name))
freeSpecificBuildingsProvided[building] = hashSetOf() freeSpecificBuildingsProvided[building.name] = hashSetOf()
freeSpecificBuildingsProvided[building]!!.add(city.id) freeSpecificBuildingsProvided[building.name]!!.add(city.id)
addFreeBuilding(city.id, building) addFreeBuilding(city.id, building.name)
} }
} }