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

Move Until Healed wake up to startTurn so Fortify lasts until start of turn (#12786)

Browse Source
This commit is contained in:
itanasi
2025-01-11 09:56:42 -08:00
committed by GitHub
parent a3b48ab532
commit 534850fd90
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt
View File

@ -35,11 +35,6 @@ class UnitTurnManager(val unit: MapUnit) {
if (!unit.hasUnitMovedThisTurn() || unit.hasUnique(UniqueType.HealsEvenAfterAction)) if (!unit.hasUnitMovedThisTurn() || unit.hasUnique(UniqueType.HealsEvenAfterAction))
healUnit() healUnit()
if (unit.action != null && unit.health > 99)
if (unit.isActionUntilHealed()) {
unit.action = null // wake up when healed
}
if (unit.isPreparingParadrop() || unit.isPreparingAirSweep()) if (unit.isPreparingParadrop() || unit.isPreparingAirSweep())
unit.action = null unit.action = null
@ -157,6 +152,11 @@ class UnitTurnManager(val unit: MapUnit) {
} }
) unit.action = null ) unit.action = null
if (unit.action != null && unit.health > 99)
if (unit.isActionUntilHealed()) {
unit.action = null // wake up when healed
}
val tileOwner = unit.getTile().getOwner() val tileOwner = unit.getTile().getOwner()
if (tileOwner != null if (tileOwner != null
&& !unit.cache.canEnterForeignTerrain && !unit.cache.canEnterForeignTerrain