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

Pass-through exclude and filterUniques, respectively (#10649)

Browse Source 
* Update BuildingDescriptions.kt

* Update BaseUnitDescriptions.kt

* Update DescriptionHelpers.kt

* Update BuildingDescriptions.kt

* Update DescriptionHelpers.kt
This commit is contained in:
dHannasch
2023-12-07 00:14:33 -07:00
committed by GitHub
parent 47e6b788af
commit be2cbbf133
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/ui/objectdescriptions/BaseUnitDescriptions.kt
View File

@ -25,7 +25,7 @@ import com.unciv.ui.screens.civilopediascreen.MarkupRenderer
object BaseUnitDescriptions { object BaseUnitDescriptions {
/** Generate short description as comma-separated string for Technology description "Units enabled" and GreatPersonPickerScreen */ /** Generate short description as comma-separated string for Technology description "Units enabled" and GreatPersonPickerScreen */
fun getShortDescription(baseUnit: BaseUnit): String { fun getShortDescription(baseUnit: BaseUnit, exclude: Unique.() -> Boolean = {false}): String {
val infoList = mutableListOf<String>() val infoList = mutableListOf<String>()
if (baseUnit.strength != 0) infoList += "${baseUnit.strength}${Fonts.strength}" if (baseUnit.strength != 0) infoList += "${baseUnit.strength}${Fonts.strength}"
if (baseUnit.rangedStrength != 0) infoList += "${baseUnit.rangedStrength}${Fonts.rangedStrength}" if (baseUnit.rangedStrength != 0) infoList += "${baseUnit.rangedStrength}${Fonts.rangedStrength}"
@ -33,7 +33,7 @@ object BaseUnitDescriptions {
for (promotion in baseUnit.promotions) for (promotion in baseUnit.promotions)
infoList += promotion.tr() infoList += promotion.tr()
if (baseUnit.replacementTextForUniques != "") infoList += baseUnit.replacementTextForUniques if (baseUnit.replacementTextForUniques != "") infoList += baseUnit.replacementTextForUniques
else baseUnit.uniquesToDescription(infoList) else baseUnit.uniquesToDescription(infoList, exclude)
return infoList.joinToString() return infoList.joinToString()
} }

6
core/src/com/unciv/ui/objectdescriptions/BuildingDescriptions.kt
View File

@ -20,7 +20,7 @@ object BuildingDescriptions {
// To stay consistent, all take the Building as normal parameter instead. // To stay consistent, all take the Building as normal parameter instead.
/** Used for AlertType.WonderBuilt, and as sub-text in Nation and Tech descriptions */ /** Used for AlertType.WonderBuilt, and as sub-text in Nation and Tech descriptions */
fun getShortDescription(building: Building, multiline: Boolean = false): String = building.run { fun getShortDescription(building: Building, multiline: Boolean = false, filterUniques: ((Unique) -> Boolean)? = null): String = building.run {
val infoList = mutableListOf<String>() val infoList = mutableListOf<String>()
this.clone().toString().also { if (it.isNotEmpty()) infoList += it } this.clone().toString().also { if (it.isNotEmpty()) infoList += it }
for ((key, value) in getStatPercentageBonuses(null)) for ((key, value) in getStatPercentageBonuses(null))
@ -30,7 +30,7 @@ object BuildingDescriptions {
infoList += "Requires worked [" + requiredNearbyImprovedResources!!.joinToString("/") { it.tr() } + "] near city" infoList += "Requires worked [" + requiredNearbyImprovedResources!!.joinToString("/") { it.tr() } + "] near city"
if (uniques.isNotEmpty()) { if (uniques.isNotEmpty()) {
if (replacementTextForUniques.isNotEmpty()) infoList += replacementTextForUniques if (replacementTextForUniques.isNotEmpty()) infoList += replacementTextForUniques
else infoList += getUniquesStringsWithoutDisablers() else infoList += getUniquesStringsWithoutDisablers(filterUniques)
} }
if (cityStrength != 0) infoList += "{City strength} +$cityStrength" if (cityStrength != 0) infoList += "{City strength} +$cityStrength"
if (cityHealth != 0) infoList += "{City health} +$cityHealth" if (cityHealth != 0) infoList += "{City health} +$cityHealth"
@ -273,7 +273,7 @@ object BuildingDescriptions {
/** /**
* @param filterUniques If provided, include only uniques for which this function returns true. * @param filterUniques If provided, include only uniques for which this function returns true.
*/ */
private fun Building.getUniquesStringsWithoutDisablers(filterUniques: ((Unique) -> Boolean)? = null) = getUniquesStrings { private fun Building.getUniquesStringsWithoutDisablers(filterUniques: ((Unique) -> Boolean)? = null): Sequence<String> = getUniquesStrings {
!it.isHiddenToUsers() !it.isHiddenToUsers()
&& (filterUniques?.invoke(it) ?: true) && (filterUniques?.invoke(it) ?: true)
} }

2
core/src/com/unciv/ui/objectdescriptions/DescriptionHelpers.kt
View File

@ -15,7 +15,7 @@ import com.unciv.ui.screens.civilopediascreen.FormattedLine
fun IHasUniques.uniquesToDescription( fun IHasUniques.uniquesToDescription(
lineList: MutableCollection<String>, lineList: MutableCollection<String>,
exclude: Unique.() -> Boolean = {false} exclude: Unique.() -> Boolean = {false}
) { ): Unit {
for (unique in uniqueObjects) { for (unique in uniqueObjects) {
if (unique.isHiddenToUsers()) continue if (unique.isHiddenToUsers()) continue
if (unique.exclude()) continue if (unique.exclude()) continue