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

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

Browse Source
This commit is contained in:
yairm210
2024-10-06 15:34:49 +03:00
parent 50f00d64c4
commit 604b9f10e7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -445,8 +445,6 @@ class ReligionManager : IsPartOfGameInfoSerialization {
fun maySpreadReligionNow(missionary: MapUnit): Boolean { fun maySpreadReligionNow(missionary: MapUnit): Boolean {
if (!maySpreadReligionAtAll(missionary)) return false if (!maySpreadReligionAtAll(missionary)) return false
if (missionary.getTile().getOwner() == null) 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 if (missionary.getTile().getCity()!!.religion.isProtectedByInquisitor(missionary.religion)) return false
return true return true
} }