From 604b9f10e784e61434fac8865933d2e81bf4d57e Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sun, 6 Oct 2024 15:34:49 +0300 Subject: [PATCH] Missionaries no longer restricted from spreading religion in city where it's already the major religion --- core/src/com/unciv/logic/civilization/Civilization.kt | 3 +++ .../com/unciv/logic/civilization/managers/ReligionManager.kt | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/Civilization.kt b/core/src/com/unciv/logic/civilization/Civilization.kt index a5ace7ddc7..d1809aa8c0 100644 --- a/core/src/com/unciv/logic/civilization/Civilization.kt +++ b/core/src/com/unciv/logic/civilization/Civilization.kt @@ -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 { diff --git a/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt b/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt index f906680c81..d571e2dd32 100644 --- a/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt @@ -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 }