From 02e10b100086ae41f33c91f627df435c7bbeed1e Mon Sep 17 00:00:00 2001 From: itanasi <44038014+itanasi@users.noreply.github.com> Date: Tue, 31 Jan 2023 12:35:53 -0800 Subject: [PATCH] Only heal when pillaging Improvements (#8511) * Only Pillaging Improvements (not Roads) Heal 25HP * Block repairs in Hostile Tiles * Revert "Block repairs in Hostile Tiles" This reverts commit ae1a2e9ece75227e5df3ee56aee4c7270657da2f. --- .../unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt b/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt index a9ca850cc1..28d7ba52a9 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt @@ -49,6 +49,7 @@ object UnitActionsPillage { UnitActionType.Pillage, action = { val pillagedImprovement = unit.currentTile.getImprovementToPillageName()!! + val pillagingImprovement = unit.currentTile.canPillageTileImprovement() val pillageText = "An enemy [${unit.baseUnit.name}] has pillaged our [$pillagedImprovement]" val icon = "ImprovementIcons/$pillagedImprovement" tile.getOwner()?.addNotification( @@ -68,7 +69,8 @@ object UnitActionsPillage { val freePillage = unit.hasUnique(UniqueType.NoMovementToPillage, checkCivInfoUniques = true) if (!freePillage) unit.useMovementPoints(1f) - unit.healBy(25) + if (pillagingImprovement) // only Improvements heal HP + unit.healBy(25) }.takeIf { unit.currentMovement > 0 && UnitActions.canPillage(unit, tile) }) }