From de1be0f6ee42a2c31447ac6ad6b6bd465545e6dd Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 27 Jan 2020 00:19:52 +0200 Subject: [PATCH] Forgot to test run =/ welp --- core/src/com/unciv/logic/automation/NextTurnAutomation.kt | 1 + core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt index ec3511fc3f..48a806121b 100644 --- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt @@ -343,6 +343,7 @@ class NextTurnAutomation{ GameSpeed.Quick -> 25 GameSpeed.Standard -> 30 GameSpeed.Epic -> 45 + GameSpeed.Marathon -> 90 } for (otherCiv in canSignResearchAgreementCiv) { // Default setting is 5, this will be changed according to different civ. diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 07a7f98412..b3b3614360 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -241,6 +241,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { GameSpeed.Quick -> 25 GameSpeed.Standard -> 30 GameSpeed.Epic -> 45 + GameSpeed.Marathon -> 90 } val researchAgreement = TradeOffer(Constants.researchAgreement, TradeType.Treaty, duration, viewingCiv.getResearchAgreementCost()) val goldCostOfSignResearchAgreement = TradeOffer("Gold".tr(), TradeType.Gold, 0, -viewingCiv.getResearchAgreementCost())