diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 3a1afe3615..cbe683925b 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -5,27 +5,27 @@ /* Ancient Era */ { name:"Worker", + unitType:"Civilian", baseDescription: "Can build improvements on tiles", movement:2, - unitType:"Civilian", hurryCostModifier:20, cost:70 }, { name:"Settler", + unitType:"Civilian", baseDescription: "Founds a new city", movement:2, - unitType:"Civilian", cost:106, hurryCostModifier:20 }, { name:"Scout", - cost:25, unitType:"Scout", + movement:2, strength:5, + cost:25, uniques:["Ignores terrain cost"] - movement:2 }, { name:"Warrior", diff --git a/android/build.gradle b/android/build.gradle index 58237f7285..e6a4d5731b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 81 - versionName "2.4.11" + versionCode 82 + versionName "2.4.11.2" } buildTypes { release { diff --git a/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt index 0d56d56653..d67269b0db 100644 --- a/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt @@ -29,7 +29,6 @@ open class PickerScreen : CameraStageBaseScreen() { descriptionLabel = Label("", CameraStageBaseScreen.skin) descriptionLabel.setWrap(true) - descriptionLabel.setFontScale(1.5f) val labelScroll = ScrollPane(descriptionLabel) bottomTable.add(labelScroll).pad(5f).width(stage.width / 2) diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index 62b1bfc831..d94b74930d 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -69,7 +69,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() } else civTech.techsToResearch = techsToResearch game.setWorldScreen() - game.worldScreen!!.update() + game.worldScreen.update() dispose() } diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt index 0a25701597..85d0e904d6 100644 --- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt +++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt @@ -93,7 +93,11 @@ open class CameraStageBaseScreen : Screen { var skin = Skin(Gdx.files.internal("skin/flat-earth-ui.json")) .apply { get(TextButton.TextButtonStyle::class.java).font = getFont(20) - get(Label.LabelStyle::class.java).font = getFont(18) } + get(Label.LabelStyle::class.java).font = getFont(18) + get(TextField.TextFieldStyle::class.java).font = getFont(18) + get(SelectBox.SelectBoxStyle::class.java).font = getFont(20) + get(SelectBox.SelectBoxStyle::class.java).listStyle.font = getFont(20) + } internal var batch: Batch = SpriteBatch() }