mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-20 12:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #366 from ninjatao/diplomacy_stats

Browse Source 
Mark defeated civs in diplomacy screen.
This commit is contained in:
yairm210
2018-12-21 11:17:30 +02:00
committed by GitHub
parent 9ca77fa399 b4fa88cada
commit e24c50f1b6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View File

@ -294,11 +294,12 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
val label = Label(civ.civName.tr(), CameraStageBaseScreen.skin) val label = Label(civ.civName.tr(), CameraStageBaseScreen.skin)
if(playerKnows(civ)) { if (civ.isDefeated()) {
civGroup.background = civGroupBackground.tint(Color.LIGHT_GRAY)
} else if (playerKnows(civ)) {
civGroup.background = civGroupBackground.tint(civ.getNation().getColor()) civGroup.background = civGroupBackground.tint(civ.getNation().getColor())
label.setFontColor(civ.getNation().getSecondaryColor()) label.setFontColor(civ.getNation().getSecondaryColor())
} } else {
else {
civGroup.background = civGroupBackground.tint(Color.DARK_GRAY) civGroup.background = civGroupBackground.tint(Color.DARK_GRAY)
label.setText("???") label.setText("???")
} }
@ -315,8 +316,8 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
} }
for(civ in relevantCivs.filter { playerKnows(it) }) for(civ in relevantCivs.filter { playerKnows(it) && !it.isDefeated() })
for(diplomacy in civ.diplomacy.values.filter { !it.otherCiv().isBarbarianCivilization() && playerKnows(it.otherCiv()) }){ for(diplomacy in civ.diplomacy.values.filter { !it.otherCiv().isBarbarianCivilization() && playerKnows(it.otherCiv()) && !it.otherCiv().isDefeated()}){
val civGroup = civGroups[civ]!! val civGroup = civGroups[civ]!!
val otherCivGroup = civGroups[diplomacy.otherCiv()]!! val otherCivGroup = civGroups[diplomacy.otherCiv()]!!