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

When spreading a religion with a great prophet, other religions are now removed (#5055)

Browse Source
This commit is contained in:
Xander Lenstra
2021-09-01 18:21:09 +02:00
committed by GitHub
parent b347366d50
commit 186d06faf0
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/assets/jsons/Civ V - Vanilla/Units.json
View File

@ -1516,9 +1516,9 @@
"name": "Great Prophet", "name": "Great Prophet",
"unitType": "Civilian", "unitType": "Civilian",
"uniques": ["Can construct [Holy site] if it hasn't used other actions yet", "Can [Spread Religion] [4] times", "uniques": ["Can construct [Holy site] if it hasn't used other actions yet", "Can [Spread Religion] [4] times",
"May found a religion", "May enhance a religion", "May enter foreign tiles without open borders", "Removes other religions when spreading religion", "May found a religion", "May enhance a religion",
"[-1] Visibility Range", "Great Person - [Faith]", "Unbuildable", "Religious Unit", "May enter foreign tiles without open borders", "[-1] Visibility Range", "Great Person - [Faith]",
"Hidden when religion is disabled"], "Unbuildable", "Religious Unit", "Hidden when religion is disabled"],
"movement": 2, "movement": 2,
"religiousStrength": 1000 "religiousStrength": 1000
}, },

8
core/src/com/unciv/logic/city/CityReligion.kt
View File

@ -59,8 +59,7 @@ class CityInfoReligionManager {
} }
fun getUniques(): Sequence<Unique> { fun getUniques(): Sequence<Unique> {
val majorityReligion = getMajorityReligion() val majorityReligion = getMajorityReligion() ?: return sequenceOf()
if (majorityReligion == null) return sequenceOf()
return majorityReligion.getFollowerUniques() return majorityReligion.getFollowerUniques()
} }
@ -72,7 +71,7 @@ class CityInfoReligionManager {
return pressures.clone() return pressures.clone()
} }
fun clearAllPressures() { private fun clearAllPressures() {
pressures.clear() pressures.clear()
// We add pressure for following no religion // We add pressure for following no religion
// Basically used as a failsafe so that there is always some religion, // Basically used as a failsafe so that there is always some religion,
@ -92,8 +91,11 @@ class CityInfoReligionManager {
fun removeAllPressuresExceptFor(religion: String) { fun removeAllPressuresExceptFor(religion: String) {
val pressureFromThisReligion = pressures[religion]!! val pressureFromThisReligion = pressures[religion]!!
// Atheism is never removed
val pressureFromAtheism = pressures[Constants.noReligionName]
clearAllPressures() clearAllPressures()
pressures.add(religion, pressureFromThisReligion) pressures.add(religion, pressureFromThisReligion)
if (pressureFromAtheism != null) pressures[Constants.noReligionName] = pressureFromAtheism
updateNumberOfFollowers() updateNumberOfFollowers()
} }

2
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -557,6 +557,8 @@ object UnitActions {
unit.civInfo.addStat(Stat.valueOf(unique.params[1]), followersOfOtherReligions * unique.params[0].toInt()) unit.civInfo.addStat(Stat.valueOf(unique.params[1]), followersOfOtherReligions * unique.params[0].toInt())
} }
city.religion.addPressure(unit.religion!!, unit.getPressureAddedFromSpread()) city.religion.addPressure(unit.religion!!, unit.getPressureAddedFromSpread())
if (unit.hasUnique("Removes other religions when spreading religion"))
city.religion.removeAllPressuresExceptFor(unit.religion!!)
unit.currentMovement = 0f unit.currentMovement = 0f
useActionWithLimitedUses(unit, Constants.spreadReligionAbilityCount) useActionWithLimitedUses(unit, Constants.spreadReligionAbilityCount)
}.takeIf { unit.currentMovement > 0 && !blockedByInquisitor } }.takeIf { unit.currentMovement > 0 && !blockedByInquisitor }