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

No height difference between hills and hills with jungle/forest

Browse Source
This commit is contained in:
Yair Morgenstern
2019-01-21 23:10:03 +02:00
parent d7067d2835
commit 9ba73c4a6f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -131,3 +131,4 @@ android/release/output.json
android/release/android-release.apk android/release/android-release.apk
android/release/release/android.aab android/release/release/android.aab
android/assets/fonts/ android/assets/fonts/
android/release/android.aab

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 193 versionCode 194
versionName "2.12.2" versionName "2.12.3"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

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

@ -87,11 +87,10 @@ open class TileInfo {
} }
fun getHeight(): Int { fun getHeight(): Int {
var height = 0 if (baseTerrain=="Mountain") return 4
if (listOf("Forest", "Jungle").contains(terrainFeature)) height += 1 if (baseTerrain == "Hill") return 2
if (baseTerrain == "Hill") height += 2 if (listOf("Forest", "Jungle").contains(terrainFeature)) return 1
if(baseTerrain=="Mountain") height = 4 return 0
return height
} }
fun getBaseTerrain(): Terrain = baseTerrainObject fun getBaseTerrain(): Terrain = baseTerrainObject