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

Resolved #11864 - Promotion added to unit with that promotion does not retrigger trigger uniques

Browse Source
This commit is contained in:
yairm210
2024-06-27 15:54:35 +03:00
parent 195a251ff3
commit 929a3b7f22
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,6 @@ object BackwardCompatibility {
fun GameInfo.guaranteeUnitPromotions() { fun GameInfo.guaranteeUnitPromotions() {
for (tileInfo in tileMap.values) for (unit in tileInfo.getUnits()) for (tileInfo in tileMap.values) for (unit in tileInfo.getUnits())
for (startingPromo in unit.baseUnit.promotions) for (startingPromo in unit.baseUnit.promotions)
if (startingPromo !in unit.promotions.promotions)
unit.promotions.addPromotion(startingPromo, true) unit.promotions.addPromotion(startingPromo, true)
} }

1
core/src/com/unciv/logic/map/mapunit/MapUnit.kt
View File

@ -875,7 +875,6 @@ class MapUnit : IsPartOfGameInfoSerialization {
for (unique in promotionUniques) { for (unique in promotionUniques) {
if (!this.matchesFilter(unique.params[2])) continue if (!this.matchesFilter(unique.params[2])) continue
val promotion = unique.params[0] val promotion = unique.params[0]
if (promotion in promotions.promotions) continue
promotions.addPromotion(promotion, true) promotions.addPromotion(promotion, true)
} }

1
core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt
View File

@ -63,6 +63,7 @@ class UnitPromotions : IsPartOfGameInfoSerialization {
} }
fun addPromotion(promotionName: String, isFree: Boolean = false) { fun addPromotion(promotionName: String, isFree: Boolean = false) {
if (promotions.contains(promotionName)) return
val ruleset = unit.civ.gameInfo.ruleset val ruleset = unit.civ.gameInfo.ruleset
val promotion = ruleset.unitPromotions[promotionName] ?: return val promotion = ruleset.unitPromotions[promotionName] ?: return

1
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -246,7 +246,6 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
else yield(RejectionReasonType.CannotBeBuilt.toInstance()) else yield(RejectionReasonType.CannotBeBuilt.toInstance())
} }
// Expensive, since adding and removing the fake unit causes side-effects
if (city != null && isAirUnit()) { if (city != null && isAirUnit()) {
// Not actually added to civ so doesn't require destroy // Not actually added to civ so doesn't require destroy
val fakeUnit = getMapUnit(civ, Constants.NO_ID) val fakeUnit = getMapUnit(civ, Constants.NO_ID)