AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-10-01 07:51:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #6184 - don't display turns to relationship change for non-decreasing city-state relationships

Browse Source
This commit is contained in:
Yair Morgenstern 2022-02-20 12:45:48 +02:00
parent 5b50f32505
commit 64b8d805c3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -200,6 +200,7 @@ class DiplomacyManager() {
if (civInfo.isCityState() && !otherCiv().isCityState()) { if (civInfo.isCityState() && !otherCiv().isCityState()) {
val dropPerTurn = getCityStateInfluenceDegrade() val dropPerTurn = getCityStateInfluenceDegrade()
return when { return when {
dropPerTurn == 0f -> 0
relationshipLevel() >= RelationshipLevel.Ally -> ceil((influence - 60f) / dropPerTurn).toInt() + 1 relationshipLevel() >= RelationshipLevel.Ally -> ceil((influence - 60f) / dropPerTurn).toInt() + 1
relationshipLevel() >= RelationshipLevel.Friend -> ceil((influence - 30f) / dropPerTurn).toInt() + 1 relationshipLevel() >= RelationshipLevel.Friend -> ceil((influence - 30f) / dropPerTurn).toInt() + 1
else -> 0 else -> 0

5
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -210,8 +210,9 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo): BaseScreen() {
if (relationLevel >= RelationshipLevel.Friend) { if (relationLevel >= RelationshipLevel.Friend) {
// RelationshipChange = Ally -> Friend or Friend -> Favorable // RelationshipChange = Ally -> Friend or Friend -> Favorable
val turnsToRelationshipChange = otherCivDiplomacyManager.getTurnsToRelationshipChange() val turnsToRelationshipChange = otherCivDiplomacyManager.getTurnsToRelationshipChange()
diplomacyTable.add("Relationship changes in another [$turnsToRelationshipChange] turns".toLabel()) if (turnsToRelationshipChange != 0)
.row() diplomacyTable.add("Relationship changes in another [$turnsToRelationshipChange] turns".toLabel())
.row()
} }
val friendBonusLabelColor = if (relationLevel >= RelationshipLevel.Friend) Color.GREEN else Color.GRAY val friendBonusLabelColor = if (relationLevel >= RelationshipLevel.Friend) Color.GREEN else Color.GRAY