Fix city screen (#1657)

* Last CityScreen fix * Atlas & Translations
2020-01-11 21:46:17 +01:00 · 2020-01-11 21:46:17 +01:00 · a1b03849ec
commit a1b03849ec
parent c37ea14df5
26 changed files with 569 additions and 505 deletions
--- a/android/Images/OtherIcons/Money.png
+++ b/android/Images/OtherIcons/Money.png
--- a/android/Images/OtherIcons/Shock.png
+++ b/android/Images/OtherIcons/Shock.png
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
--- a/android/assets/game.png
+++ b/android/assets/game.png
--- a/android/assets/game2.png
+++ b/android/assets/game2.png
--- a/android/assets/jsons/translationsByLanguage/Czech.properties
+++ b/android/assets/jsons/translationsByLanguage/Czech.properties
@ -309,6 +309,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomacie
 War = Válka
--- a/android/assets/jsons/translationsByLanguage/Dutch.properties
+++ b/android/assets/jsons/translationsByLanguage/Dutch.properties
@ -468,6 +468,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomatiek
 War = Oorlog
--- a/android/assets/jsons/translationsByLanguage/English.properties
+++ b/android/assets/jsons/translationsByLanguage/English.properties
@ -519,6 +519,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 # Requires translation!
 Diplomacy = 
--- a/android/assets/jsons/translationsByLanguage/French.properties
+++ b/android/assets/jsons/translationsByLanguage/French.properties
@ -307,6 +307,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomatie
 War = Guerre
--- a/android/assets/jsons/translationsByLanguage/German.properties
+++ b/android/assets/jsons/translationsByLanguage/German.properties
@ -312,6 +312,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomatie
 War = Krieg
--- a/android/assets/jsons/translationsByLanguage/Indonesian.properties
+++ b/android/assets/jsons/translationsByLanguage/Indonesian.properties
@ -321,6 +321,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomasi
 War = Perang
--- a/android/assets/jsons/translationsByLanguage/Italian.properties
+++ b/android/assets/jsons/translationsByLanguage/Italian.properties
@ -305,6 +305,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomazia
 War = Guerra
--- a/android/assets/jsons/translationsByLanguage/Korean.properties
+++ b/android/assets/jsons/translationsByLanguage/Korean.properties
@ -321,6 +321,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = 외교
 War = 전쟁
--- a/android/assets/jsons/translationsByLanguage/Malay.properties
+++ b/android/assets/jsons/translationsByLanguage/Malay.properties
@ -471,6 +471,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomasi
 War = Perang
--- a/android/assets/jsons/translationsByLanguage/Polish.properties
+++ b/android/assets/jsons/translationsByLanguage/Polish.properties
@ -307,6 +307,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Dyplomacja
 War = Wojna
--- a/android/assets/jsons/translationsByLanguage/Portuguese.properties
+++ b/android/assets/jsons/translationsByLanguage/Portuguese.properties
@ -309,6 +309,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomacia
 War = Guerra
--- a/android/assets/jsons/translationsByLanguage/Romanian.properties
+++ b/android/assets/jsons/translationsByLanguage/Romanian.properties
@ -402,6 +402,23 @@ Add to queue =
 # Requires translation!
 Remove from queue = 

+ # Requires translation!
+Current construction = 
+ # Requires translation!
+Construction queue = 
+ # Requires translation!
+Pick a construction = 
+ # Requires translation!
+Queue empty = 
+ # Requires translation!
+Add to queue = 
+ # Requires translation!
+Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 
+
 Diplomacy = Diplomaţie
 War = Război
 Peace = Pace
--- a/android/assets/jsons/translationsByLanguage/Russian.properties
+++ b/android/assets/jsons/translationsByLanguage/Russian.properties
@ -307,6 +307,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Дипломатия
 War = Война
--- a/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties
+++ b/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties
@ -308,6 +308,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = 外交
 War = 战争
--- a/android/assets/jsons/translationsByLanguage/Spanish.properties
+++ b/android/assets/jsons/translationsByLanguage/Spanish.properties
@ -307,6 +307,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Diplomacia
 War = Guerra
--- a/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties
+++ b/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties
@ -308,6 +308,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = 外交
 War = 戰爭
--- a/android/assets/jsons/translationsByLanguage/Ukrainian.properties
+++ b/android/assets/jsons/translationsByLanguage/Ukrainian.properties
@ -307,6 +307,10 @@ Queue empty =
 Add to queue = 
 # Requires translation!
 Remove from queue = 
+ # Requires translation!
+Show stats drilldown = 
+ # Requires translation!
+Show construction queue = 

 Diplomacy = Дипломатія
 War = Війна
--- a/android/assets/jsons/translationsByLanguage/completionPercentages.properties
+++ b/android/assets/jsons/translationsByLanguage/completionPercentages.properties
@ -1,7 +1,7 @@
 Traditional_Chinese = 95
 Italian = 99
-Polish = 99
 Russian = 99
+Polish = 98
 Romanian = 48
 Korean = 93
 Simplified_Chinese = 95
@ -13,5 +13,5 @@ Portuguese = 82
 Indonesian = 74
 Czech = 95
 Malay = 13
-Spanish = 98
+Czech = 95
 Dutch = 25
--- a/android/assets/jsons/translationsByLanguage/template.properties
+++ b/android/assets/jsons/translationsByLanguage/template.properties
@ -298,6 +298,8 @@ Pick a construction =
 Queue empty = 
 Add to queue = 
 Remove from queue = 
+Show stats drilldown = 
+Show construction queue = 

 Diplomacy = 
 War = 
--- a/core/src/com/unciv/logic/city/CityConstructions.kt
+++ b/core/src/com/unciv/logic/city/CityConstructions.kt
@ -305,10 +305,6 @@ class CityConstructions {
        ConstructionAutomation(this).chooseNextConstruction()
    }

-    fun isEnqueuable(constructionName: String): Boolean {
-        return true
-    }
-
    fun addToQueue(constructionName: String) {
        if (!isQueueFull()) {
            if (isQueueEmpty() && currentConstruction == "Nothing") {
--- a/core/src/com/unciv/ui/cityscreen/CityInfoTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityInfoTable.kt
@ -18,8 +18,8 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseS
    private val pad = 10f

    private val showConstructionsTableButton = TextButton("Show construction queue", skin)
-    private val cityInfoScrollPane: ScrollPane
-    private val cityInfoTable = Table(skin)
+    private val scrollPane: ScrollPane
+    private val innerTable = Table(skin)

    init {
        showConstructionsTableButton.onClick {
@ -27,28 +27,27 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseS
            cityScreen.update()
        }

-        cityInfoTable.width = cityScreen.stage.width/4
-        cityInfoTable.background = ImageGetter.getBackground(ImageGetter.getBlue().lerp(Color.BLACK,0.5f))
-        cityInfoScrollPane = ScrollPane(cityInfoTable.addBorder(2f, Color.WHITE))
-        cityInfoScrollPane.setOverscroll(false, false)
+        innerTable.width = cityScreen.stage.width/4
+        innerTable.background = ImageGetter.getBackground(ImageGetter.getBlue().lerp(Color.BLACK,0.5f))
+        scrollPane = ScrollPane(innerTable.addBorder(2f, Color.WHITE))
+        scrollPane.setOverscroll(false, false)

        add(showConstructionsTableButton).left().padLeft(pad).padBottom(pad).row()
-        add(cityInfoScrollPane).left().row()
+        add(scrollPane).left().row()
    }

    internal fun update() {
        val cityInfo = cityScreen.city

-        cityInfoTable.clear()
+        innerTable.clear()

-        //TODO: Sorry, this is a hack, i'm getting tired and needed some content to test the idea
-        cityInfoTable.apply {
+        innerTable.apply {
            addBuildingsInfo(cityInfo)
            addStatInfo()
            addGreatPersonPointInfo(cityInfo)
        }

-        getCell(cityInfoScrollPane).maxHeight(stage.height - showConstructionsTableButton.height - pad - 10f)
+        getCell(scrollPane).maxHeight(stage.height - showConstructionsTableButton.height - pad - 10f)
        pack()
    }