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

Modify choice of city to own the tiles acquired by a citadel - v2 (#3819)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-04-19 22:01:47 +02:00 committed by GitHub
parent b19c548c24
commit 615fa78101
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -359,8 +359,21 @@ object UnitActions {
} }
private fun takeOverTilesAround(unit: MapUnit) { private fun takeOverTilesAround(unit: MapUnit) {
// one of the neighbour tile must belong to unit's civ, so nearestCity will be never `null` // This method should only be called for a citadel - therefore one of the neighbour tile
val nearestCity = unit.currentTile.neighbors.first { it.getOwner() == unit.civInfo }.getCity() // must belong to unit's civ, so minByOrNull will be never `null`.
fun priority(tile: TileInfo): Int {
// helper calculates priority (lower is better): distance plus razing malus
val city = tile.getCity()!! // !! assertion is guaranteed by the outer filter selector.
return city.getCenterTile().aerialDistanceTo(tile) +
(if (city.isBeingRazed) 5 else 0)
}
// In the rare case more than one city owns tiles neighboring the citadel
// this will prioritize the nearest one not being razed
val nearestCity = unit.currentTile.neighbors
.filter { it.getOwner() == unit.civInfo }
.minByOrNull { priority(it) }!!.getCity()!!
// capture all tiles which do not belong to unit's civ and are not enemy cities // capture all tiles which do not belong to unit's civ and are not enemy cities
// we use getTilesInDistance here, not neighbours to include the current tile as well // we use getTilesInDistance here, not neighbours to include the current tile as well
val tilesToTakeOver = unit.currentTile.getTilesInDistance(1) val tilesToTakeOver = unit.currentTile.getTilesInDistance(1)
@ -376,7 +389,7 @@ object UnitActions {
otherCiv.getDiplomacyManager(unit.civInfo).addModifier(DiplomaticModifiers.StealingTerritory, -10f) otherCiv.getDiplomacyManager(unit.civInfo).addModifier(DiplomaticModifiers.StealingTerritory, -10f)
notifications.add(otherCiv) notifications.add(otherCiv)
} }
nearestCity!!.expansion.takeOwnership(tile) nearestCity.expansion.takeOwnership(tile)
} }
for (otherCiv in notifications) for (otherCiv in notifications)
otherCiv.addNotification("[${unit.civInfo}] has stolen your territory!", unit.currentTile.position, unit.civInfo.civName, NotificationIcon.War) otherCiv.addNotification("[${unit.civInfo}] has stolen your territory!", unit.currentTile.position, unit.civInfo.civName, NotificationIcon.War)