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

Resolved #11478 - Made diplomatic modifiers table backwards-compatible

Browse Source
This commit is contained in:
Yair Morgenstern
2024-04-16 00:32:58 +03:00
parent 66656de5fc
commit 31f16abbae
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,8 +102,12 @@ enum class DiplomaticModifiers(val text: String) {
GaveUsUnits("You gave us units!"),
GaveUsGifts("We appreciate your gifts"),
ReturnedCapturedUnits("You returned captured units to us"),
BelieveSameReligion("We believe in the same religion"),
BelieveSameReligion("We believe in the same religion");
companion object{
private val valuesAsMap = DiplomaticModifiers.values().associateBy { it.name }
fun safeValueOf(name: String) = valuesAsMap[name]
}
}
class DiplomacyManager() : IsPartOfGameInfoSerialization {
@ -113,7 +117,6 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
const val MINIMUM_INFLUENCE = -60f
}
@Suppress("JoinDeclarationAndAssignment") // incorrect warning - constructor would need to be higher in scope
@Transient
lateinit var civInfo: Civilization

4
core/src/com/unciv/ui/screens/diplomacyscreen/MajorCivDiplomacyTable.kt
View File

@ -199,7 +199,9 @@ class MajorCivDiplomacyTable(private val diplomacyScreen: DiplomacyScreen) {
&& otherCivDiplomacyManager.hasModifier(DiplomaticModifiers.DestroyedProtectedMinor))
continue
var text = DiplomaticModifiers.valueOf(modifier.key).text.tr() + " "
val diplomaticModifier = DiplomaticModifiers.safeValueOf(modifier.key)
?: continue // This modifier is from the future, you cannot understand it yet
var text = diplomaticModifier.text.tr() + " "
if (modifier.value > 0) text += "+"
text += modifier.value.roundToInt()
val color = if (modifier.value < 0) Color.RED else Color.GREEN