Resolved #399 - lakes act differently than in original game

This commit is contained in:
Yair Morgenstern 2019-01-06 22:41:03 +02:00
parent e3e6ab16b9
commit 567786c125
4 changed files with 4 additions and 5 deletions

View File

@ -49,7 +49,6 @@
food:1, food:1,
gold:1, gold:1,
RGB: [ 200, 200, 255], RGB: [ 200, 200, 255],
impassable:true,
canHaveOverlay:false canHaveOverlay:false
}, },
{ {

View File

@ -57,7 +57,7 @@
{ {
name:"Fish", name:"Fish",
resourceType:"Bonus", resourceType:"Bonus",
terrainsCanBeFoundOn:["Coast", "Lakes"], terrainsCanBeFoundOn:["Coast"],
food:1, food:1,
improvement:"Fishing Boats", improvement:"Fishing Boats",
improvementStats:{food:1}, improvementStats:{food:1},

View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 185 versionCode 187
versionName "2.11.3" versionName "2.11.5"
} }
// 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

View File

@ -25,7 +25,7 @@ class Fonts {
fun getCharsForFont(font: String): String { 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" + "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάΆέΈέΉίϊΐΊόΌύΰϋΎΫΏĂÂÊÉÎÔƠƯăâêôơưáéèíóú1234567890" +
"?'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|" "?'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|"
if (font == "Arial") return defaultText if (font == "Arial") return defaultText
if (font == chineseFont) { if (font == chineseFont) {