AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compile error from branch merging

Browse Source
This commit is contained in:
yairm210 2021-08-11 21:15:04 +03:00
parent 0d041ab1ef
commit fb266b07b2
3 changed files with 740 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1321
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

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

@ -58,15 +58,24 @@ class CityInfoReligionManager {
val religionOwningCiv = cityInfo.civInfo.gameInfo.getCivilization(cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!!.foundingCivName) val religionOwningCiv = cityInfo.civInfo.gameInfo.getCivilization(cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!!.foundingCivName)
for (unique in cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!!.getFounderUniques()) { for (unique in cityInfo.civInfo.gameInfo.religions[newMajorityReligion]!!.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)" -> unique.stats.times(cityInfo.civInfo.gameInfo.gameParameters.gameSpeed.modifier) "[] when a city adopts this religion for the first time (modified by game speed)" ->
unique.stats.times(cityInfo.civInfo.gameInfo.gameParameters.gameSpeed.modifier)
"[] when a city adopts this religion for the first time" -> unique.stats "[] when a city adopts this religion for the first time" -> unique.stats
else -> continue else -> continue
} }
religionOwningCiv.addStats(statsGranted) for (stat in statsGranted.toHashMap())
religionOwningCiv.addStat(stat.key, stat.value.toInt())
if (cityInfo.location in religionOwningCiv.exploredTiles) if (cityInfo.location in religionOwningCiv.exploredTiles)
religionOwningCiv.addNotification("You gained [$statsGranted] as your religion was spread to [${cityInfo.name}]", cityInfo.location, NotificationIcon.Faith) religionOwningCiv.addNotification(
"You gained [$statsGranted] as your religion was spread to [${cityInfo.name}]",
cityInfo.location,
NotificationIcon.Faith
)
else else
religionOwningCiv.addNotification("You gained [$statsGranted] as your religion was spread to an unknown city", NotificationIcon.Faith) religionOwningCiv.addNotification(
"You gained [$statsGranted] as your religion was spread to an unknown city",
NotificationIcon.Faith
)
} }
religionsAtSomePointAdopted.add(newMajorityReligion) religionsAtSomePointAdopted.add(newMajorityReligion)
} }