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

Multiple Start Locations per tile nicer display (#4982)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-08-24 21:56:05 +02:00 committed by GitHub
parent 34c6fda990
commit 5d95dd1c7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt
View File

@ -9,6 +9,7 @@ import com.unciv.UncivGame
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapUnit import com.unciv.logic.map.MapUnit
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
import kotlin.math.min
/** Helper class for TileGroup, which was getting too full */ /** Helper class for TileGroup, which was getting too full */
class TileGroupIcons(val tileGroup: TileGroup) { class TileGroupIcons(val tileGroup: TileGroup) {
@ -76,13 +77,13 @@ class TileGroupIcons(val tileGroup: TileGroup) {
// Display number of carried air units // Display number of carried air units
if (unit.getTile().airUnits.any { unit.isTransportTypeOf(it) } && !unit.getTile().isCityCenter()) { if (unit.getTile().airUnits.any { unit.isTransportTypeOf(it) } && !unit.getTile().isCityCenter()) {
val holder = Table() val holder = Table()
val secondarycolor = unit.civInfo.nation.getInnerColor() val secondaryColor = unit.civInfo.nation.getInnerColor()
val airUnitTable = Table().apply { defaults().pad(3f) } val airUnitTable = Table().apply { defaults().pad(3f) }
airUnitTable.background = ImageGetter.getBackground(unit.civInfo.nation.getOuterColor()) airUnitTable.background = ImageGetter.getBackground(unit.civInfo.nation.getOuterColor())
val aircraftImage = ImageGetter.getImage("OtherIcons/Aircraft") val aircraftImage = ImageGetter.getImage("OtherIcons/Aircraft")
aircraftImage.color = secondarycolor aircraftImage.color = secondaryColor
airUnitTable.add(aircraftImage).size(10f) airUnitTable.add(aircraftImage).size(10f)
airUnitTable.add(unit.getTile().airUnits.size.toString().toLabel(secondarycolor, 10)) airUnitTable.add(unit.getTile().airUnits.size.toString().toLabel(secondaryColor, 10))
val surroundedWithCircle = airUnitTable.surroundWithCircle(20f,false, unit.civInfo.nation.getOuterColor()) val surroundedWithCircle = airUnitTable.surroundWithCircle(20f,false, unit.civInfo.nation.getOuterColor())
surroundedWithCircle.circle.width *= 1.5f surroundedWithCircle.circle.width *= 1.5f
surroundedWithCircle.circle.centerX(surroundedWithCircle) surroundedWithCircle.circle.centerX(surroundedWithCircle)
@ -176,31 +177,50 @@ class TileGroupIcons(val tileGroup: TileGroup) {
if (!showResourcesAndImprovements) return if (!showResourcesAndImprovements) return
if (tileGroup.forMapEditorIcon) return // the editor options for terrain do not bother to fully initialize, so tileInfo.tileMap would be an uninitialized lateinit if (tileGroup.forMapEditorIcon) return // the editor options for terrain do not bother to fully initialize, so tileInfo.tileMap would be an uninitialized lateinit
// Allow display of up to three nations starting locations on the same tile, ignore rest // Allow display of up to three nations starting locations on the same tile, rest only as count.
// The sort is just so it shows _some_ deterministic behaviour, otherwise you could get // Sorted so major get precedence and to make the display deterministic, otherwise you could get
// different stacking order of the same nations in the same editing session // different stacking order of the same nations in the same editing session
val tileInfo = tileGroup.tileInfo val tileInfo = tileGroup.tileInfo
val nations = tileInfo.tileMap.startingLocationsByNation.asSequence() val nations = tileInfo.tileMap.startingLocationsByNation.asSequence()
.filter { tileInfo in it.value }.map { it.key }.take(3) .filter { tileInfo in it.value }
.sorted().toList() .map { it.key to ImageGetter.ruleset.nations[it.key]!! }
.sortedWith(compareBy({ it.second.isCityState() }, { it.first }))
.toList()
if (nations.isEmpty()) return if (nations.isEmpty()) return
var offsetX = (nations.size - 1) * 4f val displayCount = min(nations.size, 3)
var offsetY = (nations.size - 1) * 2f var offsetX = (displayCount - 1) * 4f
for (nation in nations) { var offsetY = (displayCount - 1) * 2f
for (nation in nations.take(3).asReversed()) {
val newNationIcon = val newNationIcon =
ImageGetter.getNationIndicator(ImageGetter.ruleset.nations[nation]!!, 20f) ImageGetter.getNationIndicator(nation.second, 20f)
tileGroup.miscLayerGroup.addActor(newNationIcon) tileGroup.miscLayerGroup.addActor(newNationIcon)
newNationIcon.run { newNationIcon.run {
setSize(20f, 20f) setSize(20f, 20f)
center(tileGroup) center(tileGroup)
x += offsetX moveBy(offsetX, offsetY)
y += offsetY
color = Color.WHITE.cpy().apply { a = 0.6f } color = Color.WHITE.cpy().apply { a = 0.6f }
} }
startingLocationIcons.add(newNationIcon) startingLocationIcons.add(newNationIcon)
offsetX -= 8f offsetX -= 8f
offsetY -= 4f offsetY -= 4f
} }
}
// Add a Label with the total count for this tile
if (nations.size > 3) {
// Tons of locations for this tile - display number in red, behind the top three
startingLocationIcons.add(nations.size.toString().toLabel(Color.BLACK.cpy().apply { a = 0.7f }, 14).apply {
tileGroup.miscLayerGroup.addActor(this)
setOrigin(Align.center)
center(tileGroup)
moveBy(14.4f, -9f)
})
startingLocationIcons.add(nations.size.toString().toLabel(Color.FIREBRICK, 14).apply {
tileGroup.miscLayerGroup.addActor(this)
setOrigin(Align.center)
center(tileGroup)
moveBy(14f, -8.4f)
})
}
}
} }