diff --git a/android/build.gradle b/android/build.gradle index 31b5ec93d0..13168582f8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 260 - versionName "2.17.9" + versionCode 262 + versionName "2.17.10-patch1" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt index 17da56e33b..d7eaa4fb03 100644 --- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt @@ -65,7 +65,7 @@ class NextTurnAutomation{ /** allow AI to spend money to purchase city-state friendship, buildings & unit */ private fun useGold(civInfo: CivilizationInfo) { if(civInfo.victoryType()==VictoryType.Cultural){ - for(cityState in civInfo.gameInfo.civilizations + for(cityState in civInfo.getKnownCivs() .filter { it.isCityState() && it.getCityStateType()==CityStateType.Cultured }){ val diploManager = cityState.getDiplomacyManager(civInfo) if(diploManager.influence < 40){ // we want to gain influence with them @@ -76,7 +76,7 @@ class NextTurnAutomation{ } if(civInfo.getHappiness() < 5){ - for(cityState in civInfo.gameInfo.civilizations + for(cityState in civInfo.getKnownCivs() .filter { it.isCityState() && it.getCityStateType()==CityStateType.Mercantile }){ val diploManager = cityState.getDiplomacyManager(civInfo) if(diploManager.influence < 40){ // we want to gain influence with them