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

Don't leak other civs in the game through LineChart colors. (#9263)

Browse Source
This commit is contained in:
WhoIsJohannes
2023-04-23 22:26:41 +02:00
committed by GitHub
parent ed3e6f2587
commit 19920ffbae
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/ui/components/LineChart.kt
View File

@ -202,16 +202,22 @@ class LineChart(
for (i in 1 until simplifiedScaledPoints.size) { for (i in 1 until simplifiedScaledPoints.size) {
val a = simplifiedScaledPoints[i - 1] val a = simplifiedScaledPoints[i - 1]
val b = simplifiedScaledPoints[i] val b = simplifiedScaledPoints[i]
val selectedCivBackgroundColor =
if (viewingCiv == civ || viewingCiv.knows(civ)) civ.nation.getInnerColor()
else Color.LIGHT_GRAY
drawLine( drawLine(
batch, a.x, a.y, b.x, b.y, batch, a.x, a.y, b.x, b.y,
civ.nation.getInnerColor(), chartLineWidth * 3 selectedCivBackgroundColor, chartLineWidth * 3
) )
} }
} }
for (i in 1 until simplifiedScaledPoints.size) { for (i in 1 until simplifiedScaledPoints.size) {
val a = simplifiedScaledPoints[i - 1] val a = simplifiedScaledPoints[i - 1]
val b = simplifiedScaledPoints[i] val b = simplifiedScaledPoints[i]
drawLine(batch, a.x, a.y, b.x, b.y, civ.nation.getOuterColor(), chartLineWidth) val civLineColor =
if (viewingCiv == civ || viewingCiv.knows(civ)) civ.nation.getOuterColor()
else Color.DARK_GRAY
drawLine(batch, a.x, a.y, b.x, b.y, civLineColor, chartLineWidth)
// Draw the selected Civ icon on its last datapoint // Draw the selected Civ icon on its last datapoint
if (i == simplifiedScaledPoints.size - 1 && selectedCiv == civ && selectedCiv in lastTurnDataPoints) { if (i == simplifiedScaledPoints.size - 1 && selectedCiv == civ && selectedCiv in lastTurnDataPoints) {