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

AI no longer purchases non-contiguous tiles

Browse Source
This commit is contained in:
Yair Morgenstern
2023-06-26 23:07:53 +03:00
parent 0536c5f24b
commit a6e4b72cf4
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt
View File

@ -391,6 +391,7 @@ object NextTurnAutomation {
bfs.stepUntilDestination(highlyDesirableTile.key) bfs.stepUntilDestination(highlyDesirableTile.key)
val tilesThatNeedBuying = val tilesThatNeedBuying =
bfs.getPathTo(highlyDesirableTile.key).filter { it.getOwner() != civInfo } bfs.getPathTo(highlyDesirableTile.key).filter { it.getOwner() != civInfo }
.toList().reversed() // getPathTo is from destination to source
// We're trying to acquire everything and revert if it fails, because of the difficult // We're trying to acquire everything and revert if it fails, because of the difficult
// way how tile acquisition cost is calculated. Everytime you buy a tile, the next one // way how tile acquisition cost is calculated. Everytime you buy a tile, the next one

4
core/src/com/unciv/logic/city/managers/CityExpansionManager.kt
View File

@ -68,6 +68,10 @@ class CityExpansionManager : IsPartOfGameInfoSerialization {
fun buyTile(tile: Tile) { fun buyTile(tile: Tile) {
val goldCost = getGoldCostOfTile(tile) val goldCost = getGoldCostOfTile(tile)
class TriedToBuyNonContiguousTileException:Exception()
if (tile.neighbors.none { it.getCity() == city })
throw TriedToBuyNonContiguousTileException()
class NotEnoughGoldToBuyTileException : Exception() class NotEnoughGoldToBuyTileException : Exception()
if (city.civ.gold < goldCost && !city.civ.gameInfo.gameParameters.godMode) if (city.civ.gold < goldCost && !city.civ.gameInfo.gameParameters.godMode)
throw NotEnoughGoldToBuyTileException() throw NotEnoughGoldToBuyTileException()