Skip to content

Commit

Permalink
Missionaries no longer restricted from spreading religion in city whe…
Browse files Browse the repository at this point in the history
…re it's already the major religion
  • Loading branch information
yairm210 committed Oct 6, 2024
1 parent 50f00d6 commit 604b9f1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 3 additions & 0 deletions core/src/com/unciv/logic/civilization/Civilization.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,9 @@ class CivilizationInfoPreview() {
playerType = civilization.playerType
playerId = civilization.playerId
}

// For easier debugging
override fun toString(): String = "$civName ($playerType) $playerId"
}

enum class CivFlags {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,6 @@ 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
}
Expand Down

0 comments on commit 604b9f1

Please sign in to comment.