diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt index ccbf6d0f7a..51d3cd4f3e 100644 --- a/core/src/com/unciv/logic/city/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt @@ -84,11 +84,7 @@ class CityExpansionManager { tileInfo.owningCity=null } - fun AcquireOwnership(tileInfo: TileInfo){ - takeOwnership(tileInfo) - } - - private fun takeOwnership(tileInfo: TileInfo){ + fun takeOwnership(tileInfo: TileInfo){ if(tileInfo.isCityCenter()) throw Exception("What?") if(tileInfo.getCity()!=null) tileInfo.getCity()!!.expansion.relinquishOwnership(tileInfo) diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index 8809ec3bc3..ed01eb2bc1 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -243,9 +243,9 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { if(tile.getOwner()!=null && tile.getOwner()!!.isPlayerCivilization() && tile.arialDistanceTo(city.getCenterTile()) <= 3 && tile.neighbors.any{it.getCity()==city}){ - val transferTileButton = TextButton("Acquire".tr(),skin) - transferTileButton.onClick { city.expansion.AcquireOwnership(tile); game.screen = CityScreen(city); dispose() } - tileTable.add(transferTileButton) + val acquireTileButton = TextButton("Acquire".tr(),skin) + acquireTileButton.onClick { city.expansion.takeOwnership(tile); game.screen = CityScreen(city); dispose() } + tileTable.add(acquireTileButton) } tileTable.pack()