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

Add "Unable to pillage tiles" unique (#10623)

Browse Source
This commit is contained in:
SeventhM
2023-11-30 09:13:24 -08:00
committed by GitHub
parent 4be14d77f4
commit 01636c27f0
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -393,6 +393,7 @@ enum class UniqueType(
// Replace with "Withdraws before melee combat <with [amount]% chance>"? // Replace with "Withdraws before melee combat <with [amount]% chance>"?
MayWithdraw("May withdraw before melee ([amount]%)", UniqueTarget.Unit), MayWithdraw("May withdraw before melee ([amount]%)", UniqueTarget.Unit),
CannotCaptureCities("Unable to capture cities", UniqueTarget.Unit), CannotCaptureCities("Unable to capture cities", UniqueTarget.Unit),
CannotPillage("Unable to pillage tiles", UniqueTarget.Unit),
// Movement // Movement
NoMovementToPillage("No movement cost to pillage", UniqueTarget.Unit, UniqueTarget.Global), NoMovementToPillage("No movement cost to pillage", UniqueTarget.Unit, UniqueTarget.Global),

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

@ -118,6 +118,7 @@ object UnitActionsPillage {
fun canPillage(unit: MapUnit, tile: Tile): Boolean { fun canPillage(unit: MapUnit, tile: Tile): Boolean {
if (unit.isTransported) return false if (unit.isTransported) return false
if (!tile.canPillageTile()) return false if (!tile.canPillageTile()) return false
if (unit.hasUnique(UniqueType.CannotPillage)) return false
val tileOwner = tile.getOwner() val tileOwner = tile.getOwner()
// Can't pillage friendly tiles, just like you can't attack them - it's an 'act of war' thing // Can't pillage friendly tiles, just like you can't attack them - it's an 'act of war' thing
return tileOwner == null || unit.civ.isAtWarWith(tileOwner) return tileOwner == null || unit.civ.isAtWarWith(tileOwner)