diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Terrains.json index f550d68650..63663ab40c 100644 --- a/android/assets/jsons/Terrains.json +++ b/android/assets/jsons/Terrains.json @@ -49,7 +49,6 @@ food:1, gold:1, RGB: [ 200, 200, 255], - impassable:true, canHaveOverlay:false }, { diff --git a/android/assets/jsons/TileResources.json b/android/assets/jsons/TileResources.json index f912bf5696..ce703afe15 100644 --- a/android/assets/jsons/TileResources.json +++ b/android/assets/jsons/TileResources.json @@ -57,7 +57,7 @@ { name:"Fish", resourceType:"Bonus", - terrainsCanBeFoundOn:["Coast", "Lakes"], + terrainsCanBeFoundOn:["Coast"], food:1, improvement:"Fishing Boats", improvementStats:{food:1}, diff --git a/android/build.gradle b/android/build.gradle index 5036a29031..fce2b63135 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 185 - versionName "2.11.3" + versionCode 187 + versionName "2.11.5" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/utils/Fonts.kt index b5b0e682fb..93c2145b96 100644 --- a/core/src/com/unciv/ui/utils/Fonts.kt +++ b/core/src/com/unciv/ui/utils/Fonts.kt @@ -25,7 +25,7 @@ class Fonts { fun getCharsForFont(font: String): String { val defaultText = "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽaäàâăbcčćçdđeéfghiîjklmnoöpqrsșštțuüvwxyzž" + "АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя" + - "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάΆέΈέΉίϊΐΊόΌύΰϋΎΫΏĂÂÊÉÔƠƯăâêôơưáéèíóú1234567890" + + "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάΆέΈέΉίϊΐΊόΌύΰϋΎΫΏĂÂÊÉÎÔƠƯăâêôơưáéèíóú1234567890" + "‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|" if (font == "Arial") return defaultText if (font == chineseFont) {