AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-10-01 07:51:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #300 from ninjatao/allow_tranfer_tile

Browse Source 
Allow city to acuqire nearby tiles from friendly cities.
This commit is contained in:
yairm210 2018-12-04 12:14:45 +02:00 committed by GitHub
commit a2a2c2ca00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class CityExpansionManager {
tileInfo.owningCity=null tileInfo.owningCity=null
} }
private fun takeOwnership(tileInfo: TileInfo){ fun takeOwnership(tileInfo: TileInfo){
if(tileInfo.isCityCenter()) throw Exception("What?") if(tileInfo.isCityCenter()) throw Exception("What?")
if(tileInfo.getCity()!=null) tileInfo.getCity()!!.expansion.relinquishOwnership(tileInfo) if(tileInfo.getCity()!=null) tileInfo.getCity()!!.expansion.relinquishOwnership(tileInfo)

7
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -240,6 +240,13 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
if(goldCostOfTile>city.civInfo.gold) buyTileButton.disable() if(goldCostOfTile>city.civInfo.gold) buyTileButton.disable()
tileTable.add(buyTileButton) tileTable.add(buyTileButton)
} }
if(tile.getOwner()!=null && tile.getOwner()!!.isPlayerCivilization()
&& tile.arialDistanceTo(city.getCenterTile()) <= 3
&& tile.neighbors.any{it.getCity()==city}){
val acquireTileButton = TextButton("Acquire".tr(),skin)
acquireTileButton.onClick { city.expansion.takeOwnership(tile); game.screen = CityScreen(city); dispose() }
tileTable.add(acquireTileButton)
}
tileTable.pack() tileTable.pack()
tileTable.setPosition(stage.width - 10f - tileTable.width, 10f) tileTable.setPosition(stage.width - 10f - tileTable.width, 10f)