mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-11 00:08:58 +07:00
Revert "Resolved #10630 - "[relativeAmount]% [stat] from every follower, up to [relativeAmount]%" works off of majority religion, not our religion"
This reverts commit 199b3ada93
.
This commit is contained in:
@ -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()
|
||||||
))
|
))
|
||||||
|
|
||||||
|
@ -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.
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user