From 8206101f34141296f23ab4a77466658f8ef4614e Mon Sep 17 00:00:00 2001 From: yairm210 Date: Thu, 15 Aug 2024 12:58:20 +0300 Subject: [PATCH] Fixed Civilopedia not showing non-unique buildings and units on techs --- .../com/unciv/ui/objectdescriptions/TechnologyDescriptions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/ui/objectdescriptions/TechnologyDescriptions.kt b/core/src/com/unciv/ui/objectdescriptions/TechnologyDescriptions.kt index 2512e20f48..e0345d0b8b 100644 --- a/core/src/com/unciv/ui/objectdescriptions/TechnologyDescriptions.kt +++ b/core/src/com/unciv/ui/objectdescriptions/TechnologyDescriptions.kt @@ -312,7 +312,7 @@ object TechnologyDescriptions { .filter { predicate(it) // expected to be the most selective, thus tested first && (it.uniqueTo != null && civInfo?.matchesFilter(it.uniqueTo!!) == true - || it.uniqueTo == null && civInfo?.getEquivalentBuilding(it) == it) + || it.uniqueTo == null && (civInfo == null || civInfo.getEquivalentBuilding(it) == it)) && !it.isHiddenFromCivilopedia(ruleset) } } @@ -327,7 +327,7 @@ object TechnologyDescriptions { .filter { it.requiredTechs().contains(techName) && (it.uniqueTo != null && civInfo?.matchesFilter(it.uniqueTo!!) == true || - it.uniqueTo == null && civInfo?.getEquivalentUnit(it) == it) + it.uniqueTo == null && (civInfo == null || civInfo.getEquivalentUnit(it) == it)) && !it.isHiddenFromCivilopedia(ruleset) } }