AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a missing percentage sign in uniques (#6036)

Browse Source 
* Fixed a missing percentage sign in uniques

* Oh, it needs a city filter of course
This commit is contained in:
Xander Lenstra 2022-01-24 16:11:39 +01:00 committed by GitHub
parent 1fd65b9ffa
commit 40cd2ba24b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/city/CityExpansionManager.kt
View File

@ -43,7 +43,7 @@ class CityExpansionManager {
cultureToNextTile *= 1.5f // City states grow slower, perhaps 150% cost? cultureToNextTile *= 1.5f // City states grow slower, perhaps 150% cost?
// Deprecated since 3.19.1 // Deprecated since 3.19.1
for (unique in cityInfo.getMatchingUniques(UniqueType.DecreasedAcquiringTilesCost)) { for (unique in cityInfo.getMatchingUniques(UniqueType.DecreasedAcquiringTilesCost) + cityInfo.getMatchingUniques(UniqueType.BorderGrowthPercentageWithoutPercentageSign)) {
if (cityInfo.matchesFilter(unique.params[1])) if (cityInfo.matchesFilter(unique.params[1]))
cultureToNextTile /= unique.params[0].toPercent() cultureToNextTile /= unique.params[0].toPercent()
} }
@ -52,7 +52,7 @@ class CityExpansionManager {
cultureToNextTile *= unique.params[0].toPercent() cultureToNextTile *= unique.params[0].toPercent()
// //
for (unique in cityInfo.getMatchingUniquesWithNonLocalEffects(UniqueType.BorderGrowthPercentage)) for (unique in cityInfo.getMatchingUniques(UniqueType.BorderGrowthPercentage))
if (cityInfo.matchesFilter(unique.params[1])) if (cityInfo.matchesFilter(unique.params[1]))
cultureToNextTile *= unique.params[0].toPercent() cultureToNextTile *= unique.params[0].toPercent()

8
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -162,10 +162,12 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
@Deprecated("As of 3.18.2", ReplaceWith("[50]% of excess happiness converted to [Culture]"), DeprecationLevel.WARNING) @Deprecated("As of 3.18.2", ReplaceWith("[50]% of excess happiness converted to [Culture]"), DeprecationLevel.WARNING)
ExcessHappinessToCultureDeprecated("50% of excess happiness added to culture towards policies", UniqueTarget.Global), ExcessHappinessToCultureDeprecated("50% of excess happiness added to culture towards policies", UniqueTarget.Global),
BorderGrowthPercentage("[amount] Culture cost of natural border growth [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief), BorderGrowthPercentage("[amount]% Culture cost of natural border growth [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@Deprecated("As of 3.19.1", ReplaceWith("[-amount] Culture cost of natural border growth [cityFilter]")) @Deprecated("As of 3.19.2", ReplaceWith("[amount]% Culture cost of natural border growth [cityFilter]"))
BorderGrowthPercentageWithoutPercentageSign("[amount]% Culture cost of natural border growth [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@Deprecated("As of 3.19.1", ReplaceWith("[-amount]% Culture cost of natural border growth [cityFilter]"))
DecreasedAcquiringTilesCost("-[amount]% Culture cost of acquiring tiles [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief), DecreasedAcquiringTilesCost("-[amount]% Culture cost of acquiring tiles [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@Deprecated("As of 3.19.1", ReplaceWith("[amount] Culture cost of natural border growth [cityFilter]")) @Deprecated("As of 3.19.1", ReplaceWith("[amount]% Culture cost of natural border growth [cityFilter]"))
CostOfNaturalBorderGrowth("[amount]% cost of natural border growth", UniqueTarget.Global, UniqueTarget.FollowerBelief), CostOfNaturalBorderGrowth("[amount]% cost of natural border growth", UniqueTarget.Global, UniqueTarget.FollowerBelief),
TileCostPercentage("[amount]% Gold cost of acquiring tiles [cityFilter]", UniqueTarget.FollowerBelief, UniqueTarget.Global), TileCostPercentage("[amount]% Gold cost of acquiring tiles [cityFilter]", UniqueTarget.FollowerBelief, UniqueTarget.Global),
@Deprecated("As of 3.19.1", ReplaceWith("[-amount]% Gold cost of acquiring tiles [cityFilter]")) @Deprecated("As of 3.19.1", ReplaceWith("[-amount]% Gold cost of acquiring tiles [cityFilter]"))