mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-23 01:24:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Show line color in more cases (#9550)

Browse Source
This commit is contained in:
WhoIsJohannes 2023-06-11 11:41:40 +02:00 committed by GitHub
parent d0acedd092
commit edac7bcd04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,8 +203,7 @@ class LineChart(
val a = simplifiedScaledPoints[i - 1]
val b = simplifiedScaledPoints[i]
val selectedCivBackgroundColor =
if (viewingCiv == civ || viewingCiv.knows(civ)) civ.nation.getInnerColor()
else Color.LIGHT_GRAY
if (useActualColor(civ)) civ.nation.getInnerColor() else Color.LIGHT_GRAY
drawLine(
batch, a.x, a.y, b.x, b.y,
selectedCivBackgroundColor, chartLineWidth * 3
@ -214,9 +213,7 @@ class LineChart(
for (i in 1 until simplifiedScaledPoints.size) {
val a = simplifiedScaledPoints[i - 1]
val b = simplifiedScaledPoints[i]
val civLineColor =
if (viewingCiv == civ || viewingCiv.knows(civ)) civ.nation.getOuterColor()
else Color.DARK_GRAY
val civLineColor = if (useActualColor(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
@ -244,6 +241,15 @@ class LineChart(
batch.transformMatrix = oldTransformMatrix
}
private fun useActualColor(civ: Civilization) : Boolean {
return viewingCiv.isSpectator() ||
viewingCiv.isDefeated() ||
viewingCiv.victoryManager.hasWon() ||
viewingCiv == civ ||
viewingCiv.knows(civ) ||
civ.isDefeated()
}
private fun getLastTurnDataPoints(): MutableMap<Civilization, DataPoint<Int>> {
val lastDataPoints = mutableMapOf<Civilization, DataPoint<Int>>()
for (dataPoint in dataPoints) {