AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Forgot to test run =/ welp

Browse Source
This commit is contained in:
Yair Morgenstern 2020-01-27 00:19:52 +02:00
parent cc764426e5
commit de1be0f6ee
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -343,6 +343,7 @@ class NextTurnAutomation{
GameSpeed.Quick -> 25 GameSpeed.Quick -> 25
GameSpeed.Standard -> 30 GameSpeed.Standard -> 30
GameSpeed.Epic -> 45 GameSpeed.Epic -> 45
GameSpeed.Marathon -> 90
} }
for (otherCiv in canSignResearchAgreementCiv) { for (otherCiv in canSignResearchAgreementCiv) {
// Default setting is 5, this will be changed according to different civ. // Default setting is 5, this will be changed according to different civ.

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

@ -241,6 +241,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
GameSpeed.Quick -> 25 GameSpeed.Quick -> 25
GameSpeed.Standard -> 30 GameSpeed.Standard -> 30
GameSpeed.Epic -> 45 GameSpeed.Epic -> 45
GameSpeed.Marathon -> 90
} }
val researchAgreement = TradeOffer(Constants.researchAgreement, TradeType.Treaty, duration, viewingCiv.getResearchAgreementCost()) val researchAgreement = TradeOffer(Constants.researchAgreement, TradeType.Treaty, duration, viewingCiv.getResearchAgreementCost())
val goldCostOfSignResearchAgreement = TradeOffer("Gold".tr(), TradeType.Gold, 0, -viewingCiv.getResearchAgreementCost()) val goldCostOfSignResearchAgreement = TradeOffer("Gold".tr(), TradeType.Gold, 0, -viewingCiv.getResearchAgreementCost())