AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #11929 - Hidden conditionals are hidden in more places

Browse Source
This commit is contained in:
yairm210 2024-07-08 14:26:13 +03:00
parent f31463782b
commit df96526f1e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/models/ruleset/Policy.kt
View File

@ -56,7 +56,7 @@ open class Policy : RulesetObject() {
|| it.type == UniqueType.OnlyAvailable || it.type == UniqueType.OnlyAvailable
|| it.type == UniqueType.OneTimeGlobalAlert || it.type == UniqueType.OneTimeGlobalAlert
} }
.joinToString("\n") { "• ${it.text.tr()}" } .joinToString("\n") { "• ${it.getDisplayText().tr()}" }
} }
override fun makeLink() = "Policy/$name" override fun makeLink() = "Policy/$name"

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

@ -292,7 +292,7 @@ object BaseUnitDescriptions {
val lostAbilityPredicate: (Unique)->Boolean = { it.text in betterUnit.uniques || it.isHiddenToUsers() } val lostAbilityPredicate: (Unique)->Boolean = { it.text in betterUnit.uniques || it.isHiddenToUsers() }
for (unique in originalUnit.uniqueObjects.filterNot(lostAbilityPredicate)) { for (unique in originalUnit.uniqueObjects.filterNot(lostAbilityPredicate)) {
// Need double translation of the "ability" here - unique texts may contain nuts - pardon, square brackets // Need double translation of the "ability" here - unique texts may contain nuts - pardon, square brackets
yield("Lost ability (vs [${originalUnit.name}]): [${unique.text.tr()}]" to null) yield("Lost ability (vs [${originalUnit.name}]): [${unique.getDisplayText().tr()}]" to null)
} }
for (promotionName in betterUnit.promotions.filter { it !in originalUnit.promotions }) { for (promotionName in betterUnit.promotions.filter { it !in originalUnit.promotions }) {
val promotion = ruleset.unitPromotions[promotionName]!! val promotion = ruleset.unitPromotions[promotionName]!!

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

@ -269,7 +269,7 @@ object BuildingDescriptions {
if (!tileBonusHashmap.containsKey(stats)) tileBonusHashmap[stats] = ArrayList() if (!tileBonusHashmap.containsKey(stats)) tileBonusHashmap[stats] = ArrayList()
tileBonusHashmap[stats]!!.add(unique.params[1]) tileBonusHashmap[stats]!!.add(unique.params[1])
} }
else -> yield(unique.text) else -> yield(unique.getDisplayText())
} }
for ((key, value) in tileBonusHashmap) for ((key, value) in tileBonusHashmap)
yield( "[stats] from [tileFilter] tiles in this city" yield( "[stats] from [tileFilter] tiles in this city"

2
core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt
View File

@ -204,7 +204,7 @@ class CivilopediaScreen(
fun shouldBeDisplayed(obj: ICivilopediaText) = fun shouldBeDisplayed(obj: ICivilopediaText) =
obj is IHasUniques && !obj.isHiddenFromCivilopedia(game.gameInfo, ruleset) obj is IHasUniques && !obj.isHiddenFromCivilopedia(game.gameInfo, ruleset)
for (loopCategory in CivilopediaCategories.values()) { for (loopCategory in CivilopediaCategories.entries) {
if (!religionEnabled && loopCategory == CivilopediaCategories.Belief) continue if (!religionEnabled && loopCategory == CivilopediaCategories.Belief) continue
categoryToEntries[loopCategory] = categoryToEntries[loopCategory] =
loopCategory.getCategoryIterator(ruleset, tutorialController) loopCategory.getCategoryIterator(ruleset, tutorialController)