diff --git a/core/src/com/unciv/logic/city/CityReligion.kt b/core/src/com/unciv/logic/city/CityReligion.kt index 0e50828871..5633a8c704 100644 --- a/core/src/com/unciv/logic/city/CityReligion.kt +++ b/core/src/com/unciv/logic/city/CityReligion.kt @@ -112,11 +112,13 @@ class CityInfoReligionManager { } private fun triggerReligionAdoption(newMajorityReligion: String) { - cityInfo.civInfo.addNotification("Your city [${cityInfo.name}] was converted to [$newMajorityReligion]!", cityInfo.location, NotificationIcon.Faith) + val newMajorityReligionObject = cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!! + cityInfo.civInfo.addNotification("Your city [${cityInfo.name}] was converted to [${newMajorityReligionObject.getReligionDisplayName()}]!", cityInfo.location, NotificationIcon.Faith) + if (newMajorityReligion in religionsAtSomePointAdopted) return - val religionOwningCiv = cityInfo.civInfo.gameInfo.getCivilization(cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!!.foundingCivName) - for (unique in cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!!.getFounderUniques()) { + val religionOwningCiv = cityInfo.civInfo.gameInfo.getCivilization(newMajorityReligionObject.foundingCivName) + for (unique in newMajorityReligionObject.getFounderUniques()) { val statsGranted = when (unique.placeholderText) { "[] when a city adopts this religion for the first time (modified by game speed)" -> unique.stats.times(cityInfo.civInfo.gameInfo.gameParameters.gameSpeed.modifier) diff --git a/core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt index f0bf3bd04e..a7f0a806b6 100644 --- a/core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt @@ -131,7 +131,7 @@ class ReligiousBeliefsPickerScreen ( private fun setupVisibleReligionIcons() { topReligionIcons.clear() - val descriptionLabel = choosingCiv.religionManager.religion!!.name.toLabel() + val descriptionLabel = choosingCiv.religionManager.religion!!.getReligionDisplayName().toLabel() val iconsTable = Table()