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

Diplomacy screen: Secondary relationships line is added (#1880)

Browse Source
This commit is contained in:
JackRainy 2020-02-08 21:58:03 +02:00 committed by GitHub
parent e2c435d36f
commit 3f27bdb19e
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,7 +342,7 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
val vector = HexMath.getVectorForAngle(2 * Math.PI.toFloat() *i / relevantCivs.size) val vector = HexMath.getVectorForAngle(2 * Math.PI.toFloat() *i / relevantCivs.size)
civGroup.center(group) civGroup.center(group)
civGroup.moveBy(vector.x*freeWidth/3, vector.y*freeHeight/3) civGroup.moveBy(vector.x*freeWidth/2.5f, vector.y*freeHeight/2.5f)
civGroup.onClick { civGroup.onClick {
onCivClicked(civLines, civ.civName) onCivClicked(civLines, civ.civName)
} }
@ -358,18 +358,38 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
val civGroup = civGroups[civ.civName]!! val civGroup = civGroups[civ.civName]!!
val otherCivGroup = civGroups[diplomacy.otherCivName]!! val otherCivGroup = civGroups[diplomacy.otherCivName]!!
if (!civLines.containsKey(civ.civName))
civLines[civ.civName] = mutableSetOf()
val statusLine = ImageGetter.getLine(civGroup.x+civGroup.width/2,civGroup.y+civGroup.height/2, val statusLine = ImageGetter.getLine(civGroup.x+civGroup.width/2,civGroup.y+civGroup.height/2,
otherCivGroup.x+otherCivGroup.width/2,otherCivGroup.y+otherCivGroup.height/2,3f) otherCivGroup.x+otherCivGroup.width/2,otherCivGroup.y+otherCivGroup.height/2,3f)
if(diplomacy.diplomaticStatus == DiplomaticStatus.War) // draw a parallel line for additional relationships
statusLine.color = Color.RED if (diplomacy.hasOpenBorders ||
else { diplomacy.diplomaticStatus == DiplomaticStatus.War ||
val diplomacyLevel = diplomacy.diplomaticModifiers.values.sum() diplomacy.totalOfScienceDuringRA > 0) {
statusLine.color = getColorForDiplomacyLevel(diplomacyLevel) val lineAngle = (statusLine.rotation-90) * Math.PI / 180
val shiftX = 4f*cos(lineAngle).toFloat()
val shiftY = 4f*sin(lineAngle).toFloat()
val secondaryLine = ImageGetter.getLine(civGroup.x+civGroup.width/2+shiftX,civGroup.y+civGroup.height/2+shiftY,
otherCivGroup.x+otherCivGroup.width/2+shiftX,otherCivGroup.y+otherCivGroup.height/2+shiftY,2f)
secondaryLine.color = when {
diplomacy.diplomaticStatus == DiplomaticStatus.War -> Color.RED
diplomacy.hasOpenBorders -> Color.CYAN
diplomacy.totalOfScienceDuringRA > 0 -> Color.BLUE
else -> Color.WHITE
} }
if (!civLines.containsKey(civ.civName)) civLines[civ.civName]!!.add(secondaryLine)
civLines[civ.civName] = mutableSetOf()
group.addActor(secondaryLine)
secondaryLine.toBack()
}
val diplomacyLevel = diplomacy.diplomaticModifiers.values.sum()
statusLine.color = getColorForDiplomacyLevel(diplomacyLevel)
civLines[civ.civName]!!.add(statusLine) civLines[civ.civName]!!.add(statusLine)
group.addActor(statusLine) group.addActor(statusLine)