diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 6584e2a0fd..2251ca96a9 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -502,7 +502,8 @@ enum class UniqueType( // Hurried means: sped up using great engineer/scientist ability, so this is in some sense a unit unique that should be here CannotBeHurried("Cannot be hurried", UniqueTarget.Building, UniqueTarget.Tech), GreatPerson("Great Person - [comment]", UniqueTarget.Unit), - GPPointPool("Is part of Great Person group [comment]", UniqueTarget.Unit), + GPPointPool("Is part of Great Person group [comment]", UniqueTarget.Unit, + docDescription = "Great people in the same group increase teach other's costs when gained. Gaining one will make all others in the same group cost more GPP."), //endregion diff --git a/tests/src/com/unciv/uniques/ResourceTests.kt b/tests/src/com/unciv/uniques/ResourceTests.kt index 8e1e5ef6f0..98fe5cd155 100644 --- a/tests/src/com/unciv/uniques/ResourceTests.kt +++ b/tests/src/com/unciv/uniques/ResourceTests.kt @@ -253,4 +253,21 @@ class ResourceTests { assertEquals(1, resourceAmountInCapital) assertEquals(1, resourceAmountInOtherCity) } + + + + @Test + fun CityResourcesWorkWithConditional() { + // given + val resource = game.createResource(UniqueType.CityResource.text) + val resourceAndConditionalBuilding = game.createBuilding("Provides [2] [${resource.name}]", + "[+1 Faith] ") + + // when + city.cityConstructions.addBuilding(resourceAndConditionalBuilding) + val faith = city.cityStats.currentCityStats.faith + + // then + assertEquals(1f, faith) + } }