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

Better milestones for world religion

Browse Source
This commit is contained in:
Yair Morgenstern
2022-08-29 00:04:44 +03:00
parent a0766f75d2
commit b1579224a8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,13 +230,15 @@ class Milestone(val uniqueDescription: String, private val parentVictory: Victor
} }
} }
MilestoneType.WorldReligion -> { MilestoneType.WorldReligion -> {
val majorCivs = civInfo.gameInfo.civilizations.filter { it.isMajorCiv() } val majorCivs = civInfo.gameInfo.civilizations.filter { it.isMajorCiv() && it.isAlive() }
val civReligion = civInfo.religionManager.religion val civReligion = civInfo.religionManager.religion
for (civ in majorCivs) { for (civ in majorCivs) {
val milestoneText = val milestoneText =
if (civInfo.knows(civ) || !civ.isAlive()) "Majority religion of [${civ.civName}]" if (civInfo.knows(civ)) "Majority religion of [${civ.civName}]"
else "Majority religion of [${Constants.unknownNationName}]" else "Majority religion of [${Constants.unknownNationName}]"
val milestoneMet = (civReligion != null && (!civReligion.isPantheon() || civInfo == civ) && civ.religionManager.isMajorityReligionForCiv(civReligion)) val milestoneMet = civReligion != null
&& (!civReligion.isPantheon() || civInfo == civ)
&& civ.religionManager.isMajorityReligionForCiv(civReligion)
buttons.add(getMilestoneButton(milestoneText, milestoneMet)) buttons.add(getMilestoneButton(milestoneText, milestoneMet))
} }
} }