mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-04 15:27:50 +07:00
Reverted 6a32d6
This commit is contained in:
@ -505,15 +505,13 @@ class DiplomacyManager() {
|
|||||||
revertToZero(DiplomaticModifiers.DeclarationOfFriendship, 1 / 2f) //decreases slowly and will revert to full if it is declared later
|
revertToZero(DiplomaticModifiers.DeclarationOfFriendship, 1 / 2f) //decreases slowly and will revert to full if it is declared later
|
||||||
|
|
||||||
if (otherCiv().isCityState()) {
|
if (otherCiv().isCityState()) {
|
||||||
|
val eraInfo = civInfo.getEraObject()
|
||||||
|
|
||||||
if (relationshipLevel() < RelationshipLevel.Friend) {
|
if (relationshipLevel() < RelationshipLevel.Friend) {
|
||||||
if (hasFlag(DiplomacyFlags.ProvideMilitaryUnit)) removeFlag(DiplomacyFlags.ProvideMilitaryUnit)
|
if (hasFlag(DiplomacyFlags.ProvideMilitaryUnit)) removeFlag(DiplomacyFlags.ProvideMilitaryUnit)
|
||||||
} else {
|
} else {
|
||||||
val relevantBonuses = if (civInfo.gameInfo.ruleSet.eras.isEmpty()) null
|
val relevantBonuses = if (relationshipLevel() == RelationshipLevel.Friend) eraInfo.friendBonus[otherCiv().cityStateType.name]
|
||||||
else {
|
else eraInfo.allyBonus[otherCiv().cityStateType.name]
|
||||||
val eraInfo = civInfo.getEraObject()
|
|
||||||
if (relationshipLevel() == RelationshipLevel.Friend) eraInfo.friendBonus[otherCiv().cityStateType.name]
|
|
||||||
else eraInfo.allyBonus[otherCiv().cityStateType.name]
|
|
||||||
}
|
|
||||||
if (relevantBonuses == null && otherCiv().cityStateType == CityStateType.Militaristic) {
|
if (relevantBonuses == null && otherCiv().cityStateType == CityStateType.Militaristic) {
|
||||||
// Deprecated, assume Civ V values for compatibility
|
// Deprecated, assume Civ V values for compatibility
|
||||||
if (!hasFlag(DiplomacyFlags.ProvideMilitaryUnit) && relationshipLevel() == RelationshipLevel.Friend)
|
if (!hasFlag(DiplomacyFlags.ProvideMilitaryUnit) && relationshipLevel() == RelationshipLevel.Friend)
|
||||||
|
Reference in New Issue
Block a user