diff --git a/.gitignore b/.gitignore index 25da14a630..978dc0450c 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,4 @@ android/release/output.json android/release/android-release.apk android/release/release/android.aab android/assets/fonts/ +android/release/android.aab diff --git a/android/build.gradle b/android/build.gradle index fcdab5f642..07f881551e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 193 - versionName "2.12.2" + versionCode 194 + versionName "2.12.3" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 98a3a7c176..4b71d2cf53 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -87,11 +87,10 @@ open class TileInfo { } fun getHeight(): Int { - var height = 0 - if (listOf("Forest", "Jungle").contains(terrainFeature)) height += 1 - if (baseTerrain == "Hill") height += 2 - if(baseTerrain=="Mountain") height = 4 - return height + if (baseTerrain=="Mountain") return 4 + if (baseTerrain == "Hill") return 2 + if (listOf("Forest", "Jungle").contains(terrainFeature)) return 1 + return 0 } fun getBaseTerrain(): Terrain = baseTerrainObject