mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-16 02:40:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

Game speed now affects golden age turns

Browse Source
This commit is contained in:
Yair Morgenstern
2019-07-24 19:34:54 +03:00
parent 994e313101
commit 4ada8528e1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/civilization/GoldenAgeManager.kt
View File

@ -28,6 +28,7 @@ class GoldenAgeManager{
var turnsToGoldenAge = 10.0 var turnsToGoldenAge = 10.0
if (civInfo.containsBuildingUnique("Golden Age length increases +50%")) turnsToGoldenAge *= 1.5 if (civInfo.containsBuildingUnique("Golden Age length increases +50%")) turnsToGoldenAge *= 1.5
if (civInfo.policies.isAdopted("Freedom Complete")) turnsToGoldenAge *= 1.5 if (civInfo.policies.isAdopted("Freedom Complete")) turnsToGoldenAge *= 1.5
turnsToGoldenAge *= civInfo.gameInfo.gameParameters.gameSpeed.getModifier()
turnsLeftForCurrentGoldenAge += turnsToGoldenAge.toInt() turnsLeftForCurrentGoldenAge += turnsToGoldenAge.toInt()
civInfo.addNotification("You have entered a golden age!", null, Color.GOLD) civInfo.addNotification("You have entered a golden age!", null, Color.GOLD)
} }

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

@ -221,7 +221,7 @@ class DiplomacyScreen:CameraStageBaseScreen() {
val demandsButton = TextButton("Demands".tr(),skin) val demandsButton = TextButton("Demands".tr(),skin)
demandsButton.onClick { demandsButton.onClick {
rightSideTable.clear(); rightSideTable.clear()
rightSideTable.add(getDemandsTable(currentPlayerCiv,otherCiv)) rightSideTable.add(getDemandsTable(currentPlayerCiv,otherCiv))
} }
diplomacyTable.add(demandsButton).row() diplomacyTable.add(demandsButton).row()