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

Fixed idiotic bug that caused the game to crash =(

Browse Source
This commit is contained in:
Yair Morgenstern
2018-05-10 11:01:55 +03:00
parent d12b665e83
commit 4c4abb452c
4 changed files with 6 additions and 4 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 49 versionCode 52
versionName "2.1.0" versionName "2.1.2"
} }
buildTypes { buildTypes {
release { release {

1
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -84,6 +84,7 @@ class UnitAutomation{
val closestCityWithoutUnit = reachableCitiesWithoutUnits val closestCityWithoutUnit = reachableCitiesWithoutUnits
.minBy { unit.movementAlgs().getShortestPath(it.getCenterTile()).size }!! .minBy { unit.movementAlgs().getShortestPath(it.getCenterTile()).size }!!
unit.movementAlgs().headTowards(closestCityWithoutUnit.getCenterTile()) unit.movementAlgs().headTowards(closestCityWithoutUnit.getCenterTile())
return
} }
if (unit.health < 80) { if (unit.health < 80) {

3
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -88,6 +88,7 @@ class CityInfo {
// we need to check which other cities exist globally and name accordingly // we need to check which other cities exist globally and name accordingly
val allExistingCityNames = civInfo.gameInfo.civilizations.flatMap { it.cities }.map { it.name }.toHashSet() val allExistingCityNames = civInfo.gameInfo.civilizations.flatMap { it.cities }.map { it.name }.toHashSet()
name = civInfo.getCivilization().cities.first { !allExistingCityNames.contains(it) } name = civInfo.getCivilization().cities.first { !allExistingCityNames.contains(it) }
this.location = cityLocation this.location = cityLocation
civInfo.cities.add(this) civInfo.cities.add(this)
if(civInfo == civInfo.gameInfo.getPlayerCivilization()) if(civInfo == civInfo.gameInfo.getPlayerCivilization())
@ -135,7 +136,7 @@ class CityInfo {
internal fun getMaxHealth(): Int { internal fun getMaxHealth(): Int {
return 200 // add more later when walls citadl etc. return 200 // add more later when walls citadel etc.
} }
override fun toString(): String {return name} // for debug override fun toString(): String {return name} // for debug

2
core/src/com/unciv/ui/worldscreen/CivStatsTable.kt
View File

@ -27,7 +27,7 @@ class CivStatsTable(val screen: WorldScreen) : Table() {
background = civBackground.tint(Color(0x004085e0)) background = civBackground.tint(Color(0x004085e0))
val resourceTable = Table() val resourceTable = Table()
resourceTable.defaults().pad(10f) resourceTable.defaults().pad(5f)
val revealedStrategicResources = GameBasics.TileResources.values val revealedStrategicResources = GameBasics.TileResources.values
.filter { it.resourceType== ResourceType.Strategic} // && civInfo.tech.isResearched(it.revealedBy!!) } .filter { it.resourceType== ResourceType.Strategic} // && civInfo.tech.isResearched(it.revealedBy!!) }
for(resource in revealedStrategicResources){ for(resource in revealedStrategicResources){