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

A "Status" column for City Overview (#10126)

Browse Source 
* Avoid the detekt false positive for typed lambda `it` and its comment

* Fix regression of what-is-a-garrison (8952)

* Initial implementation of "Status" column

* "Status" column gets a header icon
This commit is contained in:
SomeTroglodyte
2023-09-18 08:46:29 +02:00
committed by GitHub
parent 9e1ea2d4cb
commit a3d431155d
5 changed files with 205 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/OtherIcons/CityStatus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

336
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 514 KiB

After

Width:  |  Height:  |  Size: 523 KiB

1
android/assets/jsons/translations/template.properties
View File

@ -1414,6 +1414,7 @@ Civilization Info =
Relations =
Trade request =
Garrisoned by unit =
Status\n(puppet, resistance or being razed) =
# Victory

37
core/src/com/unciv/ui/screens/overviewscreen/CityOverviewTabColumn.kt
View File

@ -25,9 +25,8 @@ import kotlin.math.roundToInt
* This defines all behaviour of the [CityOverviewTab] columns through overridable parts
*/
// This false positive of detekt is possibly fixed in https://github.com/detekt/detekt/pull/6367
// (The getComparator overrides need the explicit City type on their lambda parameter)
@Suppress("ExplicitItLambdaParameter") // detekt is wrong
// Note: Using type hints on compareBy where explicitly typing the lambda `it` instead would be prettier.
// detekt would false-positive the typed `it`, see discussion in: https://github.com/detekt/detekt/pull/6367
enum class CityOverviewTabColumn : ISortableGridContentProvider<City, EmpireOverviewScreen> {
//region Enum Instances
@ -36,7 +35,7 @@ enum class CityOverviewTabColumn : ISortableGridContentProvider<City, EmpireOver
override val align = Align.left
override val fillX = true
override val defaultDescending = false
override fun getComparator() = compareBy(collator) { it: City -> it.name.tr(hideIcons = true) }
override fun getComparator() = compareBy<City, String>(collator) { it.name.tr(hideIcons = true) }
override fun getHeaderIcon(iconSize: Float) =
ImageGetter.getUnitIcon("Settler")
.surroundWithCircle(iconSize)
@ -50,6 +49,28 @@ enum class CityOverviewTabColumn : ISortableGridContentProvider<City, EmpireOver
"Total".toLabel()
},
Status {
override val headerTip = "Status\n(puppet, resistance or being razed)"
override fun getHeaderIcon(iconSize: Float) = ImageGetter.getImage("OtherIcons/CityStatus")
override fun getEntryValue(item: City) = when {
item.isBeingRazed -> 3
item.isInResistance() -> 2
item.isPuppet -> 1
else -> 0
}
override fun getEntryActor(item: City, iconSize: Float, actionContext: EmpireOverviewScreen): Actor? {
val iconPath = when {
item.isBeingRazed -> "OtherIcons/Fire"
item.isInResistance() -> "StatIcons/Resistance"
item.isPuppet -> "OtherIcons/Puppet"
else -> return null
}
// getImage is an ImageWithCustomSize, but setting size here fails - width is not respected
return ImageGetter.getImage(iconPath).surroundWithCircle(iconSize * 0.7f, color = Color.CLEAR)
}
override fun getTotalsActor(items: Iterable<City>) = null
},
ConstructionIcon {
override fun getHeaderIcon(iconSize: Float) = null
override fun getEntryValue(item: City) =
@ -69,7 +90,7 @@ enum class CityOverviewTabColumn : ISortableGridContentProvider<City, EmpireOver
override val headerTip = "Current construction"
override val defaultDescending = false
override fun getComparator() =
compareBy(collator) { it: City -> it.cityConstructions.currentConstructionFromQueue.tr(hideIcons = true) }
compareBy<City, String>(collator) { it.cityConstructions.currentConstructionFromQueue.tr(hideIcons = true) }
override fun getHeaderIcon(iconSize: Float) =
getCircledIcon("OtherIcons/Settings", iconSize)
override fun getEntryValue(item: City) = 0
@ -134,13 +155,13 @@ enum class CityOverviewTabColumn : ISortableGridContentProvider<City, EmpireOver
override val headerTip = "Garrisoned by unit"
override val defaultDescending = false
override fun getComparator() =
compareBy(collator) { it: City -> it.getCenterTile().militaryUnit?.name?.tr(hideIcons = true) ?: "" }
compareBy<City, String>(collator) { it.getGarrison()?.name?.tr(hideIcons = true) ?: "" }
override fun getHeaderIcon(iconSize: Float) =
getCircledIcon("OtherIcons/Shield", iconSize)
override fun getEntryValue(item: City) =
if (item.getCenterTile().militaryUnit != null) 1 else 0
if (item.getGarrison() != null) 1 else 0
override fun getEntryActor(item: City, iconSize: Float, actionContext: EmpireOverviewScreen): Actor? {
val unit = item.getCenterTile().militaryUnit ?: return null
val unit = item.getGarrison() ?: return null
val unitName = unit.displayName()
val unitIcon = ImageGetter.getConstructionPortrait(unit.baseUnit.getIconName(), iconSize * 0.7f)
unitIcon.addTooltip(unitName, 18f, tipAlign = Align.topLeft)