AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 10:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert knows() changes

Browse Source
This commit is contained in:
Gualdimar 2023-02-08 14:23:06 +02:00
parent e7da347a05
commit 89dc7dc01b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/Civilization.kt
View File

@ -317,7 +317,7 @@ class Civilization : IsPartOfGameInfoSerialization {
/** Returns only undefeated civs, aka the ones we care about */ /** Returns only undefeated civs, aka the ones we care about */
fun getKnownCivs() = diplomacy.values.map { it.otherCiv() }.filter { !it.isDefeated() } fun getKnownCivs() = diplomacy.values.map { it.otherCiv() }.filter { !it.isDefeated() }
fun knows(otherCivName: String) = (civName == otherCivName || diplomacy.containsKey(otherCivName)) fun knows(otherCivName: String) = diplomacy.containsKey(otherCivName)
fun knows(otherCiv: Civilization) = knows(otherCiv.civName) fun knows(otherCiv: Civilization) = knows(otherCiv.civName)
fun getCapital() = cities.firstOrNull { it.isCapital() } fun getCapital() = cities.firstOrNull { it.isCapital() }

4
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)){ if (viewingPlayer.knows(otherciv) || otherciv.civName != viewingPlayer.civName) {
return otherciv.civName return otherciv.civName
} }
return "an unknown civilization" return "an unknown civilization"
@ -179,7 +179,7 @@ class GlobalPoliticsOverviewTable (
// wars // wars
for (otherCiv in civ.getKnownCivs()) { for (otherCiv in civ.getKnownCivs()) {
if (!viewingPlayer.knows(civ)) if (!viewingPlayer.knows(otherCiv))
continue continue
if(civ.isAtWarWith(otherCiv)) { if(civ.isAtWarWith(otherCiv)) {

4
core/src/com/unciv/ui/overviewscreen/ReligionOverviewTable.kt
View File

@ -89,7 +89,7 @@ class ReligionOverviewTab(
val existingReligions: List<Religion> = gameInfo.civilizations.mapNotNull { it.religionManager.religion } val existingReligions: List<Religion> = gameInfo.civilizations.mapNotNull { it.religionManager.religion }
for (religion in existingReligions) { for (religion in existingReligions) {
val image = if (religion.isPantheon()) { val image = if (religion.isPantheon()) {
if (viewingPlayer.knows(religion.foundingCivName)) if (viewingPlayer.knows(religion.foundingCivName) || viewingPlayer.civName == religion.foundingCivName)
ImageGetter.getNationPortrait(religion.getFounder().nation, 60f) ImageGetter.getNationPortrait(religion.getFounder().nation, 60f)
else else
ImageGetter.getRandomNationPortrait(60f) ImageGetter.getRandomNationPortrait(60f)
@ -136,7 +136,7 @@ class ReligionOverviewTab(
statsTable.add(religion.getReligionDisplayName().toLabel()).right().row() statsTable.add(religion.getReligionDisplayName().toLabel()).right().row()
statsTable.add("Founding Civ:".toLabel()) statsTable.add("Founding Civ:".toLabel())
val foundingCivName = val foundingCivName =
if (viewingPlayer.knows(religion.foundingCivName)) if (viewingPlayer.knows(religion.foundingCivName) || viewingPlayer.civName == religion.foundingCivName)
religion.foundingCivName religion.foundingCivName
else Constants.unknownNationName else Constants.unknownNationName
statsTable.add(foundingCivName.toLabel()).right().row() statsTable.add(foundingCivName.toLabel()).right().row()

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

@ -217,7 +217,7 @@ class DiplomacyScreen(
var ally = otherCiv.getAllyCiv() var ally = otherCiv.getAllyCiv()
if (ally != null) { if (ally != null) {
val allyInfluence = otherCiv.getDiplomacyManager(ally).getInfluence().toInt() val allyInfluence = otherCiv.getDiplomacyManager(ally).getInfluence().toInt()
if (!viewingCiv.knows(ally)) if (!viewingCiv.knows(ally) && ally != viewingCiv.civName)
ally = "Unknown civilization" ally = "Unknown civilization"
diplomacyTable diplomacyTable
.add("Ally: [$ally] with [$allyInfluence] Influence".toLabel()) .add("Ally: [$ally] with [$allyInfluence] Influence".toLabel())