wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: barbarians pillaging ancient ruins (#1720)

Browse source 
Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
This commit is contained in:
lyrjie 2020-01-18 22:56:22 +03:00 committed by Yair Morgenstern
parent 02def2ffa9
commit 8efe21ea57
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View file

@ -322,7 +322,8 @@ class UnitActions {
fun canPillage(unit: MapUnit, tile: TileInfo): Boolean {
if (tile.improvement == null || tile.improvement == Constants.barbarianEncampment
|| tile.improvement == "City ruins") return false
|| tile.improvement == Constants.ancientRuins
|| tile.improvement == "City ruins") return false
val tileOwner = tile.getOwner()
// Can't pillage friendly tiles, just like you can't attack them - it's an 'act of war' thing
return tileOwner == null || tileOwner == unit.civInfo || unit.civInfo.isAtWarWith(tileOwner)