mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 09:18:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added city health in text description of tile

Browse Source
This commit is contained in:
Yair Morgenstern
2018-06-10 17:42:16 +03:00
parent d695cbd6f1
commit adeaa5907a
4 changed files with 4 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.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 26
versionCode 75 versionCode 77
versionName "2.4.5" versionName "2.4.7"
} }
buildTypes { buildTypes {
release { release {

2
core/src/com/unciv/GameStarter.kt
View File

@ -23,7 +23,7 @@ class GameStarter(){
for (civname in GameBasics.Civilizations.keys.filterNot { it=="Barbarians" || it==civilization }.take(numberOfCivs)) { for (civname in GameBasics.Civilizations.keys.filterNot { it=="Barbarians" || it==civilization }.take(numberOfCivs)) {
val startingLocation = freeTiles.toList().getRandom().position val startingLocation = freeTiles.toList().getRandom().position
gameInfo.civilizations.add(CivilizationInfo(civname, startingLocation, gameInfo)) // all the rest whatever gameInfo.civilizations.add(CivilizationInfo(civname, startingLocation, gameInfo))
freeTiles.removeAll(gameInfo.tileMap.getTilesInDistance(startingLocation, 6)) freeTiles.removeAll(gameInfo.tileMap.getTilesInDistance(startingLocation, 6))
} }

1
core/src/com/unciv/logic/GameInfo.kt
View File

@ -10,7 +10,6 @@ import com.unciv.models.gamebasics.GameBasics
import com.unciv.ui.utils.getRandom import com.unciv.ui.utils.getRandom
class GameInfo { class GameInfo {
//var gameOptions=HashMap<String,String>()
var notifications = mutableListOf<Notification>() var notifications = mutableListOf<Notification>()
var tutorial = mutableListOf<String>() var tutorial = mutableListOf<String>()
var civilizations = mutableListOf<CivilizationInfo>() var civilizations = mutableListOf<CivilizationInfo>()

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

@ -149,7 +149,7 @@ open class TileInfo {
val SB = StringBuilder() val SB = StringBuilder()
if (isCityCenter()) { if (isCityCenter()) {
val city = getCity()!! val city = getCity()!!
SB.appendln(city.name+ ",\r\n" + city.cityConstructions.getProductionForTileInfo()) SB.appendln(city.name+ " ("+city.health+"),\r\n" + city.cityConstructions.getProductionForTileInfo())
} }
SB.appendln(this.baseTerrain) SB.appendln(this.baseTerrain)
if (terrainFeature != null) SB.appendln(terrainFeature!!) if (terrainFeature != null) SB.appendln(terrainFeature!!)