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

Revert "Resolved #10630 - "[relativeAmount]% [stat] from every follower, up to [relativeAmount]%" works off of majority religion, not our religion"

Browse Source 
This reverts commit 199b3ada93.
This commit is contained in:
Yair Morgenstern
2023-12-01 10:23:17 +02:00
parent afae9a1e96
commit f36b05f6c0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -295,7 +295,7 @@ class CityStats(val city: City) {
for (unique in city.getMatchingUniques(UniqueType.StatPercentFromReligionFollowers)) for (unique in city.getMatchingUniques(UniqueType.StatPercentFromReligionFollowers))
addUniqueStats(unique, Stat.valueOf(unique.params[1]), addUniqueStats(unique, Stat.valueOf(unique.params[1]),
min( min(
unique.params[0].toFloat() * city.religion.getFollowersOfMajorityReligion(), unique.params[0].toFloat() * city.religion.getFollowersOfOurReligion(),
unique.params[2].toFloat() unique.params[2].toFloat()
)) ))

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

@ -61,6 +61,6 @@ interface IHasUniques : INamed {
requiredTechs().map{ ruleset.technologies[it]!! } requiredTechs().map{ ruleset.technologies[it]!! }
fun era(ruleset: Ruleset): Era? = fun era(ruleset: Ruleset): Era? =
requiredTechnologies(ruleset).map{ ruleset.eras[it.era()]!! }.maxByOrNull{ it.eraNumber } requiredTechnologies(ruleset).map{ it.era() }.map{ ruleset.eras[it]!! }.maxByOrNull{ it.eraNumber }
// This will return null only if requiredTechnologies() is empty. // This will return null only if requiredTechnologies() is empty.
} }