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

Fixed a wrongly implemented feature disabling pantheon founding (#7738)

Browse Source
This commit is contained in:
Xander Lenstra
2022-09-08 21:48:46 +02:00
committed by GitHub
parent 0542855f88
commit 11bfe93ce7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/com/unciv/logic/civilization/ReligionManager.kt
View File

@ -113,8 +113,11 @@ class ReligionManager : IsPartOfGameInfoSerialization {
if (!civInfo.isMajorCiv()) return false
if (numberOfBeliefsAvailable(BeliefType.Pantheon) == 0)
return false // no more available pantheons
if (civInfo.gameInfo.civilizations.any { it.religionManager.religionState == ReligionState.EnhancedReligion })
if (civInfo.gameInfo.civilizations.any { it.religionManager.religionState == ReligionState.EnhancedReligion }
&& civInfo.gameInfo.civilizations.count { it.religionManager.religionState >= ReligionState.Pantheon } < maxNumberOfReligions()
) {
return false
}
return (religionState == ReligionState.None && storedFaith >= faithForPantheon()) // earned pantheon
|| (freeBeliefs[BeliefType.Pantheon.name] != null && freeBeliefs[BeliefType.Pantheon.name]!! > 0) // free pantheon belief
}
@ -176,6 +179,11 @@ class ReligionManager : IsPartOfGameInfoSerialization {
}
}
private fun maxNumberOfReligions() = min(
civInfo.gameInfo.ruleSet.religions.size,
civInfo.gameInfo.civilizations.count { it.isMajorCiv() } / 2 + 1
)
/** Calculates the amount of religions that can still be founded */
fun remainingFoundableReligions(): Int {
val gameInfo = civInfo.gameInfo
@ -184,8 +192,7 @@ class ReligionManager : IsPartOfGameInfoSerialization {
}
// count the number of foundable religions left given defined ruleset religions and number of civs in game
val maxNumberOfAdditionalReligions = min(gameInfo.ruleSet.religions.size,
gameInfo.civilizations.count { it.isMajorCiv() } / 2 + 1) - foundedReligionsCount
val maxNumberOfAdditionalReligions = maxNumberOfReligions() - foundedReligionsCount
val availableBeliefsToFound = min(
numberOfBeliefsAvailable(BeliefType.Follower),