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

Make sure units always have starting promotions. (#6051)

Browse Source
This commit is contained in:
will-ca
2022-01-25 11:51:35 -08:00
committed by GitHub
parent 6a5d44c3e9
commit 88ecbc26b2
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/BackwardCompatibility.kt
View File

@ -130,4 +130,15 @@ object BackwardCompatibility {
civilizations.flatMap { civ -> civ.diplomacy.values }.forEach { it.replaceFlag() } civilizations.flatMap { civ -> civ.diplomacy.values }.forEach { it.replaceFlag() }
} }
/** Make sure all MapUnits have the starting promotions that they're supposed to. */
fun GameInfo.guaranteeUnitPromotions() {
for (tileInfo in tileMap.values) for (unit in tileInfo.getUnits()) {
for (startingPromo in unit.baseUnit.promotions) {
if (startingPromo !in unit.promotions.promotions) {
unit.promotions.addPromotion(startingPromo, true)
}
}
}
}
} }

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

@ -2,6 +2,7 @@ package com.unciv.logic
import com.unciv.Constants import com.unciv.Constants
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.BackwardCompatibility.guaranteeUnitPromotions
import com.unciv.logic.BackwardCompatibility.removeMissingModReferences import com.unciv.logic.BackwardCompatibility.removeMissingModReferences
import com.unciv.logic.automation.NextTurnAutomation import com.unciv.logic.automation.NextTurnAutomation
import com.unciv.logic.civilization.* import com.unciv.logic.civilization.*
@ -452,6 +453,8 @@ class GameInfo {
.flatMap { it.getResourceRequirements().keys } ) .flatMap { it.getResourceRequirements().keys } )
barbarians.setTransients(this) barbarians.setTransients(this)
guaranteeUnitPromotions()
} }
//endregion //endregion