mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-05 15:59:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few spots using the name of a religion instead of its displayName (#5216)

Browse Source
This commit is contained in:
Xander Lenstra
2021-09-14 16:33:06 +02:00
committed by GitHub
parent f9e0c39021
commit fe3220299c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/city/CityReligion.kt
View File

@ -112,11 +112,13 @@ class CityInfoReligionManager {
} }
private fun triggerReligionAdoption(newMajorityReligion: String) { 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 if (newMajorityReligion in religionsAtSomePointAdopted) return
val religionOwningCiv = cityInfo.civInfo.gameInfo.getCivilization(cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!!.foundingCivName) val religionOwningCiv = cityInfo.civInfo.gameInfo.getCivilization(newMajorityReligionObject.foundingCivName)
for (unique in cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!!.getFounderUniques()) { for (unique in newMajorityReligionObject.getFounderUniques()) {
val statsGranted = when (unique.placeholderText) { val statsGranted = when (unique.placeholderText) {
"[] when a city adopts this religion for the first time (modified by game speed)" -> "[] when a city adopts this religion for the first time (modified by game speed)" ->
unique.stats.times(cityInfo.civInfo.gameInfo.gameParameters.gameSpeed.modifier) unique.stats.times(cityInfo.civInfo.gameInfo.gameParameters.gameSpeed.modifier)

2
core/src/com/unciv/ui/pickerscreens/ReligiousBeliefsPickerScreen.kt
View File

@ -131,7 +131,7 @@ class ReligiousBeliefsPickerScreen (
private fun setupVisibleReligionIcons() { private fun setupVisibleReligionIcons() {
topReligionIcons.clear() topReligionIcons.clear()
val descriptionLabel = choosingCiv.religionManager.religion!!.name.toLabel() val descriptionLabel = choosingCiv.religionManager.religion!!.getReligionDisplayName().toLabel()
val iconsTable = Table() val iconsTable = Table()