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

Human players can no longer see each other's construction info

Browse Source
This commit is contained in:
Yair Morgenstern
2019-04-29 00:36:08 +03:00
parent 2b8946f5e7
commit d5b247e2c1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 232 versionCode 233
versionName "2.15.0-patch1" versionName "2.15.0-patch2"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

2
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -246,7 +246,7 @@ open class TileInfo {
var cityString = city.name var cityString = city.name
if(isViewableToPlayer) cityString += " ("+city.health+")" if(isViewableToPlayer) cityString += " ("+city.health+")"
lineList += cityString lineList += cityString
if(UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isPlayerCivilization()) if(UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isCurrentPlayer())
lineList += city.cityConstructions.getProductionForTileInfo() lineList += city.cityConstructions.getProductionForTileInfo()
} }
lineList += baseTerrain.tr() lineList += baseTerrain.tr()

4
core/src/com/unciv/ui/tilegroups/CityButton.kt
View File

@ -56,14 +56,14 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
if (city.isCapital()) { if (city.isCapital()) {
val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY } val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY }
add(starImage).size(20f).pad(2f).padLeft(5f) add(starImage).size(20f).pad(2f).padLeft(5f)
} else if (city.civInfo.isPlayerCivilization() && city.cityStats.isConnectedToCapital(RoadStatus.Road)) { } else if (city.civInfo.isCurrentPlayer() && city.cityStats.isConnectedToCapital(RoadStatus.Road)) {
val connectionImage = ImageGetter.getStatIcon("CityConnection") val connectionImage = ImageGetter.getStatIcon("CityConnection")
add(connectionImage).size(20f).pad(2f).padLeft(5f) add(connectionImage).size(20f).pad(2f).padLeft(5f)
} else { } else {
add() add()
} // this is so the health bar is always 2 columns wide } // this is so the health bar is always 2 columns wide
add(label).pad(10f) add(label).pad(10f)
if (UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isPlayerCivilization()) { if (UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isCurrentPlayer()) {
add(getConstructionGroup(city.cityConstructions)).padRight(5f) add(getConstructionGroup(city.cityConstructions)).padRight(5f)
} }
pack() pack()