From 4ada8528e1249b6baae4aa7539083b62d78ba534 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 24 Jul 2019 19:34:54 +0300 Subject: [PATCH] Game speed now affects golden age turns --- core/src/com/unciv/logic/civilization/GoldenAgeManager.kt | 1 + core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/GoldenAgeManager.kt b/core/src/com/unciv/logic/civilization/GoldenAgeManager.kt index eda21bbe78..063b143306 100644 --- a/core/src/com/unciv/logic/civilization/GoldenAgeManager.kt +++ b/core/src/com/unciv/logic/civilization/GoldenAgeManager.kt @@ -28,6 +28,7 @@ class GoldenAgeManager{ var turnsToGoldenAge = 10.0 if (civInfo.containsBuildingUnique("Golden Age length increases +50%")) turnsToGoldenAge *= 1.5 if (civInfo.policies.isAdopted("Freedom Complete")) turnsToGoldenAge *= 1.5 + turnsToGoldenAge *= civInfo.gameInfo.gameParameters.gameSpeed.getModifier() turnsLeftForCurrentGoldenAge += turnsToGoldenAge.toInt() civInfo.addNotification("You have entered a golden age!", null, Color.GOLD) } diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index abeb4e0f21..3651071af2 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -221,7 +221,7 @@ class DiplomacyScreen:CameraStageBaseScreen() { val demandsButton = TextButton("Demands".tr(),skin) demandsButton.onClick { - rightSideTable.clear(); + rightSideTable.clear() rightSideTable.add(getDemandsTable(currentPlayerCiv,otherCiv)) } diplomacyTable.add(demandsButton).row()