mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-25 23:29:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed getDiplomacyManager() Exception

Browse Source
This commit is contained in:
Gualdimar
2023-02-08 14:23:20 +02:00
parent 89dc7dc01b
commit 380ffa61d3
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
View File

@ -168,7 +168,7 @@ class GlobalPoliticsOverviewTable (
} }
private fun getCivName(otherciv: Civilization): String { private fun getCivName(otherciv: Civilization): String {
if (viewingPlayer.knows(otherciv) || otherciv.civName != viewingPlayer.civName) { if (viewingPlayer.knows(otherciv) || otherciv.civName == viewingPlayer.civName) {
return otherciv.civName return otherciv.civName
} }
return "an unknown civilization" return "an unknown civilization"
@ -177,11 +177,11 @@ class GlobalPoliticsOverviewTable (
private fun getPoliticsOfCivTable(civ: Civilization): Table { private fun getPoliticsOfCivTable(civ: Civilization): Table {
val politicsTable = Table(skin) val politicsTable = Table(skin)
if (!viewingPlayer.knows(civ) && civ.civName != viewingPlayer.civName)
return politicsTable
// wars // wars
for (otherCiv in civ.getKnownCivs()) { for (otherCiv in civ.getKnownCivs()) {
if (!viewingPlayer.knows(otherCiv))
continue
if(civ.isAtWarWith(otherCiv)) { if(civ.isAtWarWith(otherCiv)) {
println(getCivName(otherCiv)) println(getCivName(otherCiv))
val warText = "At war with [${getCivName(otherCiv)}]".toLabel() val warText = "At war with [${getCivName(otherCiv)}]".toLabel()
@ -193,9 +193,6 @@ class GlobalPoliticsOverviewTable (
// declaration of friendships // declaration of friendships
for (otherCiv in civ.getKnownCivs()) { for (otherCiv in civ.getKnownCivs()) {
if (!viewingPlayer.knows(otherCiv))
continue
if(civ.diplomacy[otherCiv.civName]?.hasFlag(DiplomacyFlags.DeclarationOfFriendship) == true) { if(civ.diplomacy[otherCiv.civName]?.hasFlag(DiplomacyFlags.DeclarationOfFriendship) == true) {
val friendText = "Friends with [${getCivName(otherCiv)}]".toLabel() val friendText = "Friends with [${getCivName(otherCiv)}]".toLabel()
friendText.color = Color.GREEN friendText.color = Color.GREEN
@ -208,9 +205,6 @@ class GlobalPoliticsOverviewTable (
// denounced civs // denounced civs
for (otherCiv in civ.getKnownCivs()) { for (otherCiv in civ.getKnownCivs()) {
if (!viewingPlayer.knows(otherCiv))
continue
if(civ.diplomacy[otherCiv.civName]?.hasFlag(DiplomacyFlags.Denunciation) == true) { if(civ.diplomacy[otherCiv.civName]?.hasFlag(DiplomacyFlags.Denunciation) == true) {
val denouncedText = "Denounced [${getCivName(otherCiv)}]".toLabel() val denouncedText = "Denounced [${getCivName(otherCiv)}]".toLabel()
denouncedText.color = Color.RED denouncedText.color = Color.RED
@ -223,9 +217,6 @@ class GlobalPoliticsOverviewTable (
//allied CS //allied CS
for (cityState in gameInfo.getAliveCityStates()) { for (cityState in gameInfo.getAliveCityStates()) {
if (!viewingPlayer.knows(cityState))
continue
if (cityState.diplomacy[civ.civName]?.relationshipLevel() == RelationshipLevel.Ally) { if (cityState.diplomacy[civ.civName]?.relationshipLevel() == RelationshipLevel.Ally) {
val alliedText = "Allied with [${getCivName(cityState)}]".toLabel() val alliedText = "Allied with [${getCivName(cityState)}]".toLabel()
alliedText.color = Color.GREEN alliedText.color = Color.GREEN