added 2 unique to change name/appearance of civ

core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt

@@ -133,10 +133,10 @@ object NextTurnAutomation {
                 if (civInfo.diplomacyFunctions.canSignDeclarationOfFriendshipWith(requestingCiv)
                     && DiplomacyAutomation.wantsToSignDeclarationOfFrienship(civInfo,requestingCiv)) {
                     diploManager.signDeclarationOfFriendship()
-                    requestingCiv.addNotification("We have signed a Declaration of Friendship with [${civInfo.civName}]!", NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, civInfo.civName)
+                    requestingCiv.addNotification("We have signed a Declaration of Friendship with [${civInfo.displayCivName}]!", NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, civInfo.displayCivName)
                 } else  {
                     diploManager.otherCivDiplomacy().setFlag(DiplomacyFlags.DeclinedDeclarationOfFriendship, 10)
-                    requestingCiv.addNotification("[${civInfo.civName}] has denied our Declaration of Friendship!", NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, civInfo.civName)
+                    requestingCiv.addNotification("[${civInfo.displayCivName}] has denied our Declaration of Friendship!", NotificationCategory.Diplomacy, NotificationIcon.Diplomacy, civInfo.displayCivName)
                 }
             }
         }
@@ -602,15 +602,15 @@ object NextTurnAutomation {
             diplomacyManager.hasFlag(DiplomacyFlags.IgnoreThemSettlingNearUs) -> {
             }
             diplomacyManager.hasFlag(DiplomacyFlags.AgreedToNotSettleNearUs) -> {
-                otherCiv.popupAlerts.add(PopupAlert(AlertType.CitySettledNearOtherCivDespiteOurPromise, civInfo.civName))
+                otherCiv.popupAlerts.add(PopupAlert(AlertType.CitySettledNearOtherCivDespiteOurPromise, civInfo.displayCivName))
                 diplomacyManager.setFlag(DiplomacyFlags.IgnoreThemSettlingNearUs, 100)
                 diplomacyManager.setModifier(DiplomaticModifiers.BetrayedPromiseToNotSettleCitiesNearUs, -20f)
                 diplomacyManager.removeFlag(DiplomacyFlags.AgreedToNotSettleNearUs)
             }
             else -> {
                 val threatLevel = Automation.threatAssessment(civInfo, otherCiv)
                 if (threatLevel < ThreatLevel.High) // don't piss them off for no reason please.
-                    otherCiv.popupAlerts.add(PopupAlert(AlertType.DemandToStopSettlingCitiesNear, civInfo.civName))
+                    otherCiv.popupAlerts.add(PopupAlert(AlertType.DemandToStopSettlingCitiesNear, civInfo.displayCivName))
             }
         }
         diplomacyManager.removeFlag(DiplomacyFlags.SettledCitiesNearUs)
@@ -621,15 +621,15 @@ object NextTurnAutomation {
         when {
             diplomacyManager.hasFlag(DiplomacyFlags.IgnoreThemSpreadingReligion) -> {}
             diplomacyManager.hasFlag(DiplomacyFlags.AgreedToNotSpreadReligion) -> {
-                otherCiv.popupAlerts.add(PopupAlert(AlertType.ReligionSpreadDespiteOurPromise, civInfo.civName))
+                otherCiv.popupAlerts.add(PopupAlert(AlertType.ReligionSpreadDespiteOurPromise, civInfo.displayCivName))
                 diplomacyManager.setFlag(DiplomacyFlags.IgnoreThemSpreadingReligion, 100)
                 diplomacyManager.setModifier(DiplomaticModifiers.BetrayedPromiseToNotSpreadReligionToUs, -20f)
                 diplomacyManager.removeFlag(DiplomacyFlags.AgreedToNotSpreadReligion)
             }
             else -> {
                 val threatLevel = Automation.threatAssessment(civInfo, otherCiv)
                 if (threatLevel < ThreatLevel.High) // don't piss them off for no reason please.
-                    otherCiv.popupAlerts.add(PopupAlert(AlertType.DemandToStopSpreadingReligion, civInfo.civName))
+                    otherCiv.popupAlerts.add(PopupAlert(AlertType.DemandToStopSpreadingReligion, civInfo.displayCivName))
             }
         }
         diplomacyManager.removeFlag(DiplomacyFlags.SpreadReligionInOurCities)

core/src/com/unciv/logic/civilization/Civilization.kt

@@ -156,6 +156,8 @@ class Civilization : IsPartOfGameInfoSerialization {
      */
     var civName = ""
         private set
+    var displayCivName = ""
+        private set
 
     var tech = TechManager()
     var policies = PolicyManager()
@@ -259,6 +261,7 @@ class Civilization : IsPartOfGameInfoSerialization {
 
     constructor(civName: String) {
         this.civName = civName
+        this.displayCivName = civName
     }
 
     fun clone(): Civilization {
@@ -267,6 +270,7 @@ class Civilization : IsPartOfGameInfoSerialization {
         toReturn.playerType = playerType
         toReturn.playerId = playerId
         toReturn.civName = civName
+        toReturn.displayCivName = displayCivName
         toReturn.tech = tech.clone()
         toReturn.policies = policies.clone()
         toReturn.civConstructions = civConstructions.clone()
@@ -775,8 +779,8 @@ class Civilization : IsPartOfGameInfoSerialization {
      *  And if the civs don't yet know who they are then they don't know if they're barbarians =\
      *  */
     fun setNationTransient() {
-        nation = gameInfo.ruleset.nations[civName]
-                ?: throw UncivShowableException("Nation $civName is not found!")
+        nation = gameInfo.ruleset.nations[displayCivName]
+                ?: throw UncivShowableException("Nation $displayCivName is not found!")
     }
 
     fun setTransients() {
@@ -1070,6 +1074,10 @@ class Civilization : IsPartOfGameInfoSerialization {
         else
             lastSeenImprovement[position] = improvement
     }
+
+    fun changeDisplayCivName(name: String) {
+        this.displayCivName = name
+    }
 }
 
 /**

core/src/com/unciv/logic/civilization/managers/TechManager.kt

@@ -478,6 +478,29 @@ class TechManager : IsPartOfGameInfoSerialization {
                 unique,
                 civInfo,
                 triggerNotificationText = "due to entering the [${currentEra.name}]")
+        for (unique in era.getMatchingUniques(UniqueType.ChangeCivilizationName)) {
+            /* 
+            check if there is any civ with this name.
+            And this try-catch setement to not crash the game if the civ is not playing 
+            */
+
+            if (civInfo.gameInfo.civilizations.firstOrNull{ it.civName == unique.params[0] } != null) {
+                val civ = civInfo.gameInfo.getCivilization(unique.params[0])
+                civ.changeDisplayCivName(unique.params[1])
+            }
+        }    
+
+        for (unique in era.getMatchingUniques(UniqueType.ChangeCivilizationNation)) {
+            // check if there is any civ with this name.
+            if (civInfo.gameInfo.civilizations.firstOrNull{ it.civName == unique.params[0] } != null) {
+                val civ = civInfo.gameInfo.getCivilization(unique.params[0])
+                val dummyNation = civInfo.gameInfo.ruleset.nations[unique.params[1]]
+                if (dummyNation != null) {
+                    civ.changeDisplayCivName(unique.params[1])
+                    civ.nation = dummyNation
+                }
+            } 
+        }
     }
 
     private fun updateEra() {

core/src/com/unciv/models/ruleset/unique/UniqueType.kt

@@ -258,6 +258,10 @@ enum class UniqueType(
     TriggersVictory("Triggers victory", UniqueTarget.Global),
     TriggersCulturalVictory("Triggers a Cultural Victory upon completion", UniqueTarget.Global),
 
+    // Civ appearance
+    ChangeCivilizationName("Change civilization [civFilter] name to [civFilter]",UniqueTarget.Era),
+    ChangeCivilizationNation("Change civilization [civFilter] nation to [civFilter]",UniqueTarget.Era),
+
     /// Misc.
     MayBuyConstructionsInPuppets("May buy items in puppet cities", UniqueTarget.Global),
     MayNotAnnexCities("May not annex cities", UniqueTarget.Global),
@@ -602,7 +606,7 @@ enum class UniqueType(
     RoughTerrain("Rough terrain", UniqueTarget.Terrain),
 
     ExcludedFromMapEditor("Excluded from map editor", UniqueTarget.Terrain, UniqueTarget.Improvement, UniqueTarget.Resource, UniqueTarget.Nation, flags = UniqueFlag.setOfHiddenToUsers),
-
+    
     /////// Resource uniques
     ResourceAmountOnTiles("Deposits in [tileFilter] tiles always provide [amount] resources", UniqueTarget.Resource),
     CityStateOnlyResource("Can only be created by Mercantile City-States", UniqueTarget.Resource),

core/src/com/unciv/ui/screens/diplomacyscreen/CityStateDiplomacyTable.kt

@@ -156,7 +156,7 @@ class CityStateDiplomacyTable(private val diplomacyScreen: DiplomacyScreen) {
         val nextLevelString = when {
             atWar -> ""
             otherCivDiplomacyManager.getInfluence().toInt() < 30 -> "Reach 30 for friendship."
-            ally == viewingCiv.civName -> ""
+            ally == viewingCiv.displayCivName-> ""
             else -> "Reach highest influence above 60 for alliance."
         }
         diplomacyTable.add(diplomacyScreen.getRelationshipTable(otherCivDiplomacyManager)).row()
@@ -472,8 +472,8 @@ class CityStateDiplomacyTable(private val diplomacyScreen: DiplomacyScreen) {
         val warTable = Table()
         warTable.defaults().pad(10f)
 
-        val title = "War against [${target.civName}]"
-        val description = "We need you to help us defend against [${target.civName}]. Killing [${otherCiv.questManager.unitsToKill(target)}] of their military units would slow their offensive."
+        val title = "War against [${target.displayCivName}]"
+        val description = "We need you to help us defend against [${target.displayCivName}]. Killing [${otherCiv.questManager.unitsToKill(target)}] of their military units would slow their offensive."
         val progress = if (viewingCiv.knows(target)) "Currently you have killed [${otherCiv.questManager.unitsKilledSoFar(target, viewingCiv)}] of their military units."
         else "You need to find them first!"
 

core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt

@@ -170,7 +170,7 @@ class DiplomacyScreen(
                 questIcon.x = floor(civIndicator.width - questIcon.width)
             }
 
-            val civNameLabel = civ.civName.toLabel(hideIcons = true)
+            val civNameLabel = civ.displayCivName.toLabel(hideIcons = true)
 
             // The wrapper serves only to highlight the selected civ better
             val civButton = Table().apply {
@@ -275,7 +275,7 @@ class DiplomacyScreen(
 
     private fun getDeclareWarButtonText(otherCiv: Civilization): String {
         val messageLines = arrayListOf<String>()
-        messageLines += "Declare war on [${otherCiv.civName}]?"
+        messageLines += "Declare war on [${otherCiv.displayCivName}]?"
         // Tell the player who all will join the other side from defensive pacts
         val otherCivDefensivePactList = otherCiv.diplomacy.values.filter {
             otherCivDiploManager -> otherCivDiploManager.otherCiv() != viewingCiv
@@ -286,7 +286,7 @@ class DiplomacyScreen(
         // Defensive pact chains are not allowed now
         for (civ in otherCivDefensivePactList) {
             messageLines += if (viewingCiv.knows(civ)) {
-                "[${civ.civName}] will also join them in the war"
+                "[${civ.displayCivName}] will also join them in the war"
             } else {
                 "An unknown civilization will also join them in the war"
             }

core/src/com/unciv/ui/screens/diplomacyscreen/MajorCivDiplomacyTable.kt

@@ -129,7 +129,7 @@ class MajorCivDiplomacyTable(private val diplomacyScreen: DiplomacyScreen) {
     ): TextButton {
         val denounceButton = "Denounce ([30] turns)".toTextButton()
         denounceButton.onClick {
-            ConfirmPopup(diplomacyScreen, "Denounce [${otherCiv.civName}]?", "Denounce ([30] turns)") {
+            ConfirmPopup(diplomacyScreen, "Denounce [${otherCiv.displayCivName}]?", "Denounce ([30] turns)") {
                 diplomacyManager.denounce()
                 diplomacyScreen.updateLeftSideTable(otherCiv)
                 diplomacyScreen.setRightSideFlavorText(otherCiv, "We will remember this.", "Very well.")

core/src/com/unciv/ui/screens/diplomacyscreen/OfferColumnsTable.kt

@@ -66,15 +66,15 @@ class OfferColumnsTable(
         if (!isPortraitMode) {
             // In landscape, arrange in 4 panels: ours left / theirs right ; items top / offers bottom.
             add("Our items".tr())
-            add("[${tradeLogic.otherCivilization.civName}]'s items".tr()).row()
+            add("[${tradeLogic.otherCivilization.displayCivName}]'s items".tr()).row()
 
             add(ourAvailableOffersTable).prefSize(columnWidth, screen.stage.height / 2)
             add(theirAvailableOffersTable).prefSize(columnWidth, screen.stage.height / 2).row()
 
             addSeparator().height(2f)
 
             add("Our trade offer".tr())
-            add("[${tradeLogic.otherCivilization.civName}]'s trade offer".tr()).row()
+            add("[${tradeLogic.otherCivilization.displayCivName}]'s trade offer".tr()).row()
             add(ourOffersTable).size(columnWidth, screen.stage.height / 3)
             add(theirOffersTable).size(columnWidth, screen.stage.height / 3)
         } else {
@@ -85,13 +85,13 @@ class OfferColumnsTable(
 
             addSeparator().height(2f)
 
-            add("[${tradeLogic.otherCivilization.civName}]'s items".tr()).colspan(2).row()
+            add("[${tradeLogic.otherCivilization.displayCivName}]'s items".tr()).colspan(2).row()
             add(theirAvailableOffersTable).height(screen.stage.height / 4f).colspan(2).row()
 
             addSeparator().height(5f)
 
             add("Our trade offer".tr())
-            add("[${tradeLogic.otherCivilization.civName}]'s trade offer".tr()).row()
+            add("[${tradeLogic.otherCivilization.displayCivName}]'s trade offer".tr()).row()
             add(ourOffersTable).height(screen.stage.height / 4f).width(columnWidth)
             add(theirOffersTable).height(screen.stage.height / 4f).width(columnWidth)
         }

core/src/com/unciv/ui/screens/newgamescreen/NationPickerPopup.kt

@@ -14,6 +14,7 @@ import com.unciv.logic.civilization.PlayerType
 import com.unciv.models.metadata.GameSettings.NationPickerListMode
 import com.unciv.models.metadata.Player
 import com.unciv.models.ruleset.nation.Nation
+import com.unciv.models.ruleset.unique.UniqueType
 import com.unciv.models.translations.tr
 import com.unciv.ui.audio.MusicMood
 import com.unciv.ui.audio.MusicTrackChooserFlags
@@ -176,7 +177,7 @@ internal class NationPickerPopup(
 
         // Decide by listMode how each block is built -
         // for each a factory producing an Actor and info on how to select it
-        fun getListModeNationActor(element: NationIterationElement): Pair<WidgetGroup, SelectInfo> {
+        fun getListModeNationActor(element: NationIterationElement): Pair<NationTable, SelectInfo> {
             val currentSelectInfo = SelectInfo(element.nation, currentY)
             val nationTable = NationTable(element.nation, civBlocksWidth, 0f) // no need for min height
             val cell = nationListTable.add(nationTable)
@@ -215,7 +216,7 @@ internal class NationPickerPopup(
 
         for (element in getSortedNations()) {
             val (nationActor, currentSelectInfo) = nationActorFactory(element)
-
+            
             nationActor.onClick {
                 highlightNation(currentSelectInfo)
             }
@@ -238,7 +239,7 @@ internal class NationPickerPopup(
                     nationListTable.keyShortcuts.add(key) { onKeyPress(key) }
                 }
             }
-        }
+        }    
 
         nationListScroll.layout()
         pack()

core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt

@@ -155,7 +155,7 @@ class GlobalPoliticsOverviewTable(
         val civInfoTable = Table(skin)
         val leaderName = civ.nation.leaderName
         civInfoTable.add(leaderName.toLabel(fontSize = 30)).row()
-        civInfoTable.add(civ.civName.toLabel(hideIcons = true)).row()
+        civInfoTable.add(civ.displayCivName.toLabel(hideIcons = true)).row()
         civInfoTable.add(civ.tech.era.name.toLabel()).row()
         return civInfoTable
     }
@@ -196,7 +196,7 @@ class GlobalPoliticsOverviewTable(
 
     private fun getCivName(otherciv: Civilization): String {
         if (viewingPlayer.knows(otherciv) || otherciv.civName == viewingPlayer.civName) {
-            return otherciv.civName
+            return otherciv.displayCivName
         }
         return "an unknown civilization"
     }

core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCivGroup.kt

@@ -59,8 +59,8 @@ internal class VictoryScreenCivGroup(
         val labelText =
             if (currentPlayer.knows(civ) || currentPlayer == civ ||
                     civ.isDefeated() || currentPlayer.isDefeated()) {
-                if (additionalInfo.isEmpty()) civ.civName
-                    else "{${civ.civName}}$separator{$additionalInfo}"
+                if (additionalInfo.isEmpty()) civ.displayCivName
+                    else "{${civ.displayCivName}}$separator{$additionalInfo}"
             } else Constants.unknownNationName
 
         val civInfo = getCivImageAndColors(civ, currentPlayer, defeatedPlayerStyle)