From c7265c79b6ccf0b5a536842c0ab313947e41190c Mon Sep 17 00:00:00 2001 From: yairm210 Date: Thu, 19 Aug 2021 20:43:47 +0300 Subject: [PATCH] Reverted 6a32d6 --- .../logic/civilization/diplomacy/DiplomacyManager.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index f9306d4190..e7aa017da3 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -505,15 +505,13 @@ class DiplomacyManager() { revertToZero(DiplomaticModifiers.DeclarationOfFriendship, 1 / 2f) //decreases slowly and will revert to full if it is declared later if (otherCiv().isCityState()) { + val eraInfo = civInfo.getEraObject() + if (relationshipLevel() < RelationshipLevel.Friend) { if (hasFlag(DiplomacyFlags.ProvideMilitaryUnit)) removeFlag(DiplomacyFlags.ProvideMilitaryUnit) } else { - val relevantBonuses = if (civInfo.gameInfo.ruleSet.eras.isEmpty()) null - else { - val eraInfo = civInfo.getEraObject() - if (relationshipLevel() == RelationshipLevel.Friend) eraInfo.friendBonus[otherCiv().cityStateType.name] - else eraInfo.allyBonus[otherCiv().cityStateType.name] - } + val relevantBonuses = if (relationshipLevel() == RelationshipLevel.Friend) eraInfo.friendBonus[otherCiv().cityStateType.name] + else eraInfo.allyBonus[otherCiv().cityStateType.name] if (relevantBonuses == null && otherCiv().cityStateType == CityStateType.Militaristic) { // Deprecated, assume Civ V values for compatibility if (!hasFlag(DiplomacyFlags.ProvideMilitaryUnit) && relationshipLevel() == RelationshipLevel.Friend)