From ee55839557eca93eb3d8c88d6e4e1bfadc7d890c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 13 Feb 2019 19:02:11 +0200 Subject: [PATCH] Fixed minor problem with Egypt's neutral "let's hear it" responses Current construction in city better represented --- android/assets/jsons/Nations.json | 2 +- android/build.gradle | 2 +- core/src/com/unciv/ui/cityscreen/CityScreen.kt | 2 +- core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index 8e2246fb..5037ef89 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -95,7 +95,7 @@ introduction:" Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations." neutralHello:"Good day." - letsHearIt:["Go on.","Speak.","I am all ears."] + neutralLetsHearIt:["Go on.","Speak.","I am all ears."] neutralNo:["No.","Definitely not."] neutralYes:["Okay.","Very well."] diff --git a/android/build.gradle b/android/build.gradle index e2729f0f..0156c5a0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,7 +21,7 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 202 + versionCode 203 versionName "2.13.3" } diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index 4387034a..498d5a0b 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -204,7 +204,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { dispose() } - cityPickerTable.add(exitCityButton).colspan(cityPickerTable.columns) + cityPickerTable.add(exitCityButton).pad(10f).colspan(cityPickerTable.columns) cityPickerTable.pack() cityPickerTable.centerX(stage) diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt index 8fe935a7..5633c7d2 100644 --- a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt @@ -146,8 +146,9 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre currentConstructionTable.background = ImageGetter.getBackground(ImageGetter.getBlue().lerp(Color.BLACK,0.5f)) currentConstructionTable.pad(10f) - currentConstructionTable.add(ImageGetter.getConstructionImage(city.cityConstructions.currentConstruction)) - .size(30f).pad(5f) + currentConstructionTable.add( + ImageGetter.getConstructionImage(city.cityConstructions.currentConstruction).surroundWithCircle(50f)) + .pad(5f) val buildingText = city.cityConstructions.getCityProductionTextForCityButton() currentConstructionTable.add(Label(buildingText, CameraStageBaseScreen.skin).setFontColor(Color.WHITE)).row()