AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 10:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only heal when pillaging Improvements (#8511)

Browse Source 
* Only Pillaging Improvements (not Roads) Heal 25HP

* Block repairs in Hostile Tiles

* Revert "Block repairs in Hostile Tiles"

This reverts commit ae1a2e9ece75227e5df3ee56aee4c7270657da2f.
This commit is contained in:
itanasi 2023-01-31 12:35:53 -08:00 committed by GitHub
parent 898d312109
commit 02e10b1000
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/ui/worldscreen/unit/actions/UnitActionsPillage.kt
View File

@ -49,6 +49,7 @@ object UnitActionsPillage {
UnitActionType.Pillage, UnitActionType.Pillage,
action = { action = {
val pillagedImprovement = unit.currentTile.getImprovementToPillageName()!! val pillagedImprovement = unit.currentTile.getImprovementToPillageName()!!
val pillagingImprovement = unit.currentTile.canPillageTileImprovement()
val pillageText = "An enemy [${unit.baseUnit.name}] has pillaged our [$pillagedImprovement]" val pillageText = "An enemy [${unit.baseUnit.name}] has pillaged our [$pillagedImprovement]"
val icon = "ImprovementIcons/$pillagedImprovement" val icon = "ImprovementIcons/$pillagedImprovement"
tile.getOwner()?.addNotification( tile.getOwner()?.addNotification(
@ -68,7 +69,8 @@ object UnitActionsPillage {
val freePillage = unit.hasUnique(UniqueType.NoMovementToPillage, checkCivInfoUniques = true) val freePillage = unit.hasUnique(UniqueType.NoMovementToPillage, checkCivInfoUniques = true)
if (!freePillage) unit.useMovementPoints(1f) 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) }) }.takeIf { unit.currentMovement > 0 && UnitActions.canPillage(unit, tile) })
} }