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

Resolved #1808 - Disabled declaration of friendship

Browse Source
This commit is contained in:
Yair Morgenstern
2020-01-30 20:16:05 +02:00
parent c2eac14b3a
commit 1119968f59
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ class NextTurnAutomation{
respondToTradeRequests(civInfo) respondToTradeRequests(civInfo)
if(civInfo.isMajorCiv()) { if(civInfo.isMajorCiv()) {
offerDeclarationOfFriendship(civInfo) // offerDeclarationOfFriendship(civInfo)
offerPeaceTreaty(civInfo) offerPeaceTreaty(civInfo)
offerResearchAgreement(civInfo) offerResearchAgreement(civInfo)
exchangeTechs(civInfo) exchangeTechs(civInfo)

3
core/src/com/unciv/ui/mapeditor/MapDownloadPopup.kt
View File

@ -34,6 +34,9 @@ class MapDownloadPopup(loadMapScreen: LoadMapScreen): Popup(loadMapScreen) {
scrollableMapTable.add(downloadMapButton).row() scrollableMapTable.add(downloadMapButton).row()
} }
contentTable.add(ScrollPane(scrollableMapTable)).height(screen.stage.height * 2 / 3).row() contentTable.add(ScrollPane(scrollableMapTable)).height(screen.stage.height * 2 / 3).row()
pack()
close()
open()
} }
} catch (ex: Exception) { } catch (ex: Exception) {
addGoodSizedLabel("Could not get list of maps!").row() addGoodSizedLabel("Could not get list of maps!").row()