wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #302 from ninjatao/fix_acquire

Browse source 
Fix : can acquire tiles that already belong to the city.
This commit is contained in:
yairm210 2018-12-04 20:22:40 +02:00 committed by GitHub
commit bb78673edc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View file

@ -240,7 +240,8 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
if(goldCostOfTile>city.civInfo.gold) buyTileButton.disable()
tileTable.add(buyTileButton)
}
if(tile.getOwner()!=null && tile.getOwner()!!.isPlayerCivilization()
if(tile.getOwner()!=null && tile.getCity()!=city
&& tile.getOwner()!!.isPlayerCivilization()
&& tile.arialDistanceTo(city.getCenterTile()) <= 3
&& tile.neighbors.any{it.getCity()==city}){
val acquireTileButton = TextButton("Acquire".tr(),skin)