diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 85eea6848e..82ef09af06 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -1645,6 +1645,18 @@ Simplified_Chinese:"恭喜!你赢得了征服胜利!" Portuguese:"Você ganhou uma vitória de dominação!" } + + "You have achieved victory through the awesome power of your Culture. Your civilization's greatness - the magnificence of its monuments and the power of its artists - have astounded the world! Poets will honor you as long as beauty brings gladness to a weary heart.":{ + } + + "The world has been convulsed by war. May great and powerful civilizations have fallen, but you have survived - and emerged victorious! The world will long remember your glorious triumph!":{ + } + + "You have achieved victory through mastery of Science! You have conquered the mysteries of nature and led your people on a voyage to a brave new world! Your triumph will be remembered as long as the stars burn in the night sky!":{ + } + + "You have been defeated. Your civilization has been overwhelmed by its many foes. But your people do not despair, for they know that one day you shall return - and lead them forward to victory!":{ + } "One more turn...!":{ Italian:"Aspetta! Solo un altro turno..." diff --git a/core/src/com/unciv/ui/VictoryScreen.kt b/core/src/com/unciv/ui/VictoryScreen.kt index 9fff8806f6..f671d021a7 100644 --- a/core/src/com/unciv/ui/VictoryScreen.kt +++ b/core/src/com/unciv/ui/VictoryScreen.kt @@ -71,7 +71,15 @@ class VictoryScreen : PickerScreen() { fun wonOrLost(description: String) { - descriptionLabel.setText(description.tr()) + + val endGameMessage = when(description){ + "You have won a cultural victory!" -> "You have achieved victory through the awesome power of your Culture. Your civilization's greatness - the magnificence of its monuments and the power of its artists - have astounded the world! Poets will honor you as long as beauty brings gladness to a weary heart." + "You have won a domination victory!" -> "The world has been convulsed by war. May great and powerful civilizations have fallen, but you have survived - and emerged victorious! The world will long remember your glorious triumph!" + "You have won a scientific victory!" -> "You have achieved victory through mastery of Science! You have conquered the mysteries of nature and led your people on a voyage to a brave new world! Your triumph will be remembered as long as the stars burn in the night sky!" + else -> "You have been defeated. Your civilization has been overwhelmed by its many foes. But your people do not despair, for they know that one day you shall return - and lead them forward to victory!" + } + + descriptionLabel.setText(description.tr()+"\n"+endGameMessage.tr() ) rightSideButton.setText("Start new game".tr()) rightSideButton.isVisible = true diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 7addc82271..c60fc26d51 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -316,15 +316,15 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() { val text = when { !isPlayersTurn -> "Waiting for other players..." viewingCiv.shouldGoToDueUnit() -> "Next unit" - viewingCiv.cities.any{it.cityConstructions.currentConstruction==""} -> "Pick construction" + viewingCiv.cities.any { it.cityConstructions.currentConstruction == "" } -> "Pick construction" viewingCiv.shouldOpenTechPicker() -> "Pick a tech" viewingCiv.policies.shouldOpenPolicyPicker -> "Pick a policy" else -> "Next turn" } nextTurnButton.setText(text.tr()) - nextTurnButton.color = if(text=="Next turn") Color.WHITE else Color.GRAY + nextTurnButton.color = if (text == "Next turn") Color.WHITE else Color.GRAY nextTurnButton.pack() - if(AlertPopup.isOpen || !isPlayersTurn) nextTurnButton.disable() + if (AlertPopup.isOpen || !isPlayersTurn) nextTurnButton.disable() else nextTurnButton.enable() nextTurnButton.setPosition(stage.width - nextTurnButton.width - 10f, topBar.y - nextTurnButton.height - 10f) }