diff --git a/android/build.gradle b/android/build.gradle index 832ce05936..8f2e7a53b9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 99 - versionName "2.6.2" + versionCode 101 + versionName "2.6.3.1" } buildTypes { release { diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index d8dc2b5df1..1b399eca9a 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -190,11 +190,10 @@ class CivilizationInfo { policies.endTurn(nextTurnStats.culture.toInt()) + // disband units until there are none left OR the gold values are normal if(!isBarbarianCivilization() && gold < -100){ - // disband units until there are none left OR the gold values are normal - val unitUpkeepBeforeDisbands = getUnitUpkeep() var civMilitaryUnits = getCivUnits().filter { it.getBaseUnit().unitType!=UnitType.Civilian } - while(nextTurnStats.gold.toInt() - unitUpkeepBeforeDisbands + getUnitUpkeep() < 0 + if(nextTurnStats.gold.toInt() < 0 && civMilitaryUnits.isNotEmpty()){ val unitToDisband = civMilitaryUnits.first() unitToDisband.removeFromTile()