AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 14:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed minor problem with Egypt's neutral "let's hear it" responses

Browse Source 
Current construction in city better represented
This commit is contained in:
Yair Morgenstern 2019-02-13 19:02:11 +02:00
parent 748e84f265
commit ee55839557
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Nations.json
View File

@ -95,7 +95,7 @@
introduction:" Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations." introduction:" Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations."
neutralHello:"Good day." neutralHello:"Good day."
letsHearIt:["Go on.","Speak.","I am all ears."] neutralLetsHearIt:["Go on.","Speak.","I am all ears."]
neutralNo:["No.","Definitely not."] neutralNo:["No.","Definitely not."]
neutralYes:["Okay.","Very well."] neutralYes:["Okay.","Very well."]

2
android/build.gradle
View File

@ -21,7 +21,7 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 202 versionCode 203
versionName "2.13.3" versionName "2.13.3"
} }

2
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -204,7 +204,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
dispose() dispose()
} }
cityPickerTable.add(exitCityButton).colspan(cityPickerTable.columns) cityPickerTable.add(exitCityButton).pad(10f).colspan(cityPickerTable.columns)
cityPickerTable.pack() cityPickerTable.pack()
cityPickerTable.centerX(stage) cityPickerTable.centerX(stage)

5
core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
View File

@ -146,8 +146,9 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
currentConstructionTable.background = ImageGetter.getBackground(ImageGetter.getBlue().lerp(Color.BLACK,0.5f)) currentConstructionTable.background = ImageGetter.getBackground(ImageGetter.getBlue().lerp(Color.BLACK,0.5f))
currentConstructionTable.pad(10f) currentConstructionTable.pad(10f)
currentConstructionTable.add(ImageGetter.getConstructionImage(city.cityConstructions.currentConstruction)) currentConstructionTable.add(
.size(30f).pad(5f) ImageGetter.getConstructionImage(city.cityConstructions.currentConstruction).surroundWithCircle(50f))
.pad(5f)
val buildingText = city.cityConstructions.getCityProductionTextForCityButton() val buildingText = city.cityConstructions.getCityProductionTextForCityButton()
currentConstructionTable.add(Label(buildingText, CameraStageBaseScreen.skin).setFontColor(Color.WHITE)).row() currentConstructionTable.add(Label(buildingText, CameraStageBaseScreen.skin).setFontColor(Color.WHITE)).row()