From 70d6697f16bc3c3777ed497b2d52cdd3e9dd4ae2 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 10 Dec 2018 11:04:40 +0200 Subject: [PATCH] Added icon for simplified chinese, missing character for Portuguese, ancient ruins no longer appear on impassible tiles --- android/Images/FlagIcons/Simplified Chinese.png | Bin 0 -> 4038 bytes .../com/unciv/logic/map/RandomMapGenerator.kt | 3 ++- core/src/com/unciv/ui/utils/Fonts.kt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 android/Images/FlagIcons/Simplified Chinese.png diff --git a/android/Images/FlagIcons/Simplified Chinese.png b/android/Images/FlagIcons/Simplified Chinese.png new file mode 100644 index 0000000000000000000000000000000000000000..a9613f4376d4b1022a5b0ac62ecb0a8c62dae7bf GIT binary patch literal 4038 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 literal 0 HcmV?d00001 diff --git a/core/src/com/unciv/logic/map/RandomMapGenerator.kt b/core/src/com/unciv/logic/map/RandomMapGenerator.kt index 037bb9e9e1..ef24a13519 100644 --- a/core/src/com/unciv/logic/map/RandomMapGenerator.kt +++ b/core/src/com/unciv/logic/map/RandomMapGenerator.kt @@ -271,7 +271,8 @@ open class RandomMapGenerator { } fun maybeAddAncientRuins(tile: TileInfo) { - if(tile.getBaseTerrain().type!=TerrainType.Water && Random().nextDouble() < 1f/100) + val baseTerrain = tile.getBaseTerrain() + if(baseTerrain.type!=TerrainType.Water && !baseTerrain.impassable && Random().nextDouble() < 1f/100) tile.improvement = "Ancient ruins" } diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/utils/Fonts.kt index 27cd9ee181..395bbb3f7a 100644 --- a/core/src/com/unciv/ui/utils/Fonts.kt +++ b/core/src/com/unciv/ui/utils/Fonts.kt @@ -23,7 +23,7 @@ class Fonts { val chineseFont = "SimSun" fun getCharsForFont(font: String): String { - val defaultText = "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽaäàâăbcčćdđeéfghiîjklmnoöpqrsșštțuüvwxyzž" + + val defaultText = "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽaäàâăbcčćçdđeéfghiîjklmnoöpqrsșštțuüvwxyzž" + "АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя" + "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάΆέΈέΉίϊΐΊόΌύΰϋΎΫΏĂÂÊÉÔƠƯăâêôơưáéèíóú1234567890" + "‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|"