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

Fixed crash when liberating cities when you haven't met their original owners

Browse Source
This commit is contained in:
Yair Morgenstern
2019-12-22 18:50:40 +02:00
parent 314b620405
commit fb244943fb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -397,6 +397,11 @@ class CityInfo {
val percentageOfCivPopulationInThatCity = population.population * val percentageOfCivPopulationInThatCity = population.population *
100f / (foundingCiv.cities.sumBy { it.population.population } + population.population) 100f / (foundingCiv.cities.sumBy { it.population.population } + population.population)
val respecForLiberatingOurCity = 10f + percentageOfCivPopulationInThatCity.roundToInt() val respecForLiberatingOurCity = 10f + percentageOfCivPopulationInThatCity.roundToInt()
// In order to get "plus points" in Diplomacy, you have to establish diplomatic relations if you haven't yet
if(!conqueringCiv.knows(foundingCiv))
conqueringCiv.meetCivilization(foundingCiv)
if(foundingCiv.isMajorCiv()) { if(foundingCiv.isMajorCiv()) {
foundingCiv.getDiplomacyManager(conqueringCiv) foundingCiv.getDiplomacyManager(conqueringCiv)
.addModifier(DiplomaticModifiers.CapturedOurCities, respecForLiberatingOurCity) .addModifier(DiplomaticModifiers.CapturedOurCities, respecForLiberatingOurCity)