AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-25 04:43:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Missionaries no longer restricted from spreading religion in city where it's already the major religion"

Browse Source 
This reverts commit 604b9f10e784e61434fac8865933d2e81bf4d57e.
This commit is contained in:
yairm210 2024-10-06 16:02:52 +03:00
parent 2a6516d15e
commit 246142dffc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/civilization/Civilization.kt
View File

@ -1028,9 +1028,6 @@ class CivilizationInfoPreview() {
playerType = civilization.playerType
playerId = civilization.playerId
}
// For easier debugging
override fun toString(): String = "$civName ($playerType) $playerId"
}
enum class CivFlags {

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

@ -445,6 +445,8 @@ class ReligionManager : IsPartOfGameInfoSerialization {
fun maySpreadReligionNow(missionary: MapUnit): Boolean {
if (!maySpreadReligionAtAll(missionary)) return false
if (missionary.getTile().getOwner() == null) return false
if (missionary.currentTile.owningCity?.religion?.getMajorityReligion()?.name == missionary.religion)
return false
if (missionary.getTile().getCity()!!.religion.isProtectedByInquisitor(missionary.religion)) return false
return true
}