wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undiscovered civs aren't revealed in Overview by their icons

Browse source 
Irrelevant Overviews are disabled
This commit is contained in:
Yair Morgenstern 2019-06-19 20:52:26 +03:00
parent 7958c795dd
commit 2b3de8b78f
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View file

@ -45,7 +45,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
setStatsInfoButton.onClick {
centerTable.clear()
centerTable.add(ScrollPane(HorizontalGroup().apply {
space(20f)
space(40f)
top()
addActor(getHappinessTable())
addActor(getGoldTable())
@ -62,6 +62,8 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
centerTable.pack()
}
topTable.add(setCurrentTradesButton)
if(currentPlayerCivInfo.diplomacy.values.all { it.trades.isEmpty() })
setCurrentTradesButton.disable()
val setUnitsButton = TextButton("Units".tr(),skin)
setUnitsButton.onClick {
@ -87,6 +89,8 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
centerTable.pack()
}
topTable.add(setResourcesButton)
if(currentPlayerCivInfo.getDetailedCivResources().isEmpty())
setResourcesButton.disable()
topTable.pack()
@ -386,10 +390,11 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
label.setAlignment(Align.center)
if (civ.isDefeated()) {
civGroup.background = civGroupBackground.tint(Color.LIGHT_GRAY)
civGroup.add(ImageGetter.getImage("OtherIcons/DisbandUnit")).size(30f)
civGroup.background = civGroupBackground.tint(Color.LIGHT_GRAY)
label.setFontColor(Color.BLACK)
} else if (currentPlayer==civ || currentPlayer.knows(civ)) {
civGroup.add(ImageGetter.getNationIndicator(civ.getNation(), 30f))
civGroup.background = civGroupBackground.tint(civ.getNation().getColor())
label.setFontColor(civ.getNation().getSecondaryColor())
} else {
@ -397,7 +402,6 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
label.setText("???")
}
civGroup.add(ImageGetter.getNationIndicator(civ.getNation(), 30f))
civGroup.add(label).pad(10f)
civGroup.pack()
return civGroup