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

Solved crash where city states would try to gift great people without cities

Browse Source
This commit is contained in:
Yair Morgenstern 2021-07-31 23:17:57 +03:00
parent 692cbaa84a
commit 3afe7af431
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.md
View File

@ -10,10 +10,6 @@ AI accepts research agreement offers
Buildings from era are applied before buildings from policies Buildings from era are applied before buildings from policies
Translations update
Updated Hungarian Translates - By JurDan775
By SomeTroglodyte: By SomeTroglodyte:
- Civilopedia phase 8 - Nations and Promotions - Civilopedia phase 8 - Nations and Promotions
- UnitActionType now knows keys, sounds and most icons - UnitActionType now knows keys, sounds and most icons

11
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -608,11 +608,14 @@ class CivilizationInfo {
for (flag in flagsCountdown.keys.toList()) { for (flag in flagsCountdown.keys.toList()) {
if (flag == CivFlags.cityStateGreatPersonGift.name) { if (flag == CivFlags.cityStateGreatPersonGift.name) {
val cityStateAllies = getKnownCivs().filter { it.isCityState() && it.getAllyCiv() == civName }.count() val cityStateAllies =
getKnownCivs().filter { it.isCityState() && it.getAllyCiv() == civName }
if (cityStateAllies >= 1) flagsCountdown[flag] = flagsCountdown[flag]!! - 1 if (cityStateAllies.any()) flagsCountdown[flag] = flagsCountdown[flag]!! - 1
if (flagsCountdown[flag]!! < min(cityStateAllies, 10)) { if (flagsCountdown[flag]!! < min(cityStateAllies.count(), 10) && cities.isNotEmpty()
&& cityStateAllies.any { it.cities.isNotEmpty() }
) {
gainGreatPersonFromCityState() gainGreatPersonFromCityState()
flagsCountdown[flag] = turnsForGreatPersonFromCityState() flagsCountdown[flag] = turnsForGreatPersonFromCityState()
} }
@ -779,7 +782,7 @@ class CivilizationInfo {
/** Gain a random great person from a random city state */ /** Gain a random great person from a random city state */
private fun gainGreatPersonFromCityState() { private fun gainGreatPersonFromCityState() {
val givingCityState = getKnownCivs().filter { it.isCityState() && it.getAllyCiv() == civName}.random() val givingCityState = getKnownCivs().filter { it.isCityState() && it.getAllyCiv() == civName && it.cities.isNotEmpty()}.random()
var giftableUnits = gameInfo.ruleSet.units.values.filter { it.isGreatPerson() } var giftableUnits = gameInfo.ruleSet.units.values.filter { it.isGreatPerson() }
if (!gameInfo.hasReligionEnabled()) giftableUnits = giftableUnits.filterNot { it.uniques.contains("Great Person - [Faith]")} if (!gameInfo.hasReligionEnabled()) giftableUnits = giftableUnits.filterNot { it.uniques.contains("Great Person - [Faith]")}
if (giftableUnits.isEmpty()) // For badly defined mods that don't have great people but do have the policy that makes city states grant them if (giftableUnits.isEmpty()) // For badly defined mods that don't have great people but do have the policy that makes city states grant them