mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 13:18:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

'Years of peace' modifier reset when war is declared

Browse Source
This commit is contained in:
Yair Morgenstern
2021-03-29 20:18:03 +03:00
parent 807444d2c5
commit cb50732ec4
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/MainMenuScreen.kt
View File

@ -58,7 +58,7 @@ class MainMenuScreen: CameraStageBaseScreen() {
Actions.fadeOut(0f), Actions.fadeOut(0f),
Actions.run { Actions.run {
mapHolder.apply { mapHolder.apply {
addTiles(this@MainMenuScreen.stage.width, this@MainMenuScreen.stage.height) addTiles(this@MainMenuScreen.stage.width/3, this@MainMenuScreen.stage.height/3)
touchable = Touchable.disabled touchable = Touchable.disabled
setScale(0.5f) setScale(0.5f)
} }

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

@ -481,6 +481,7 @@ class DiplomacyManager() {
trades.clear() trades.clear()
updateHasOpenBorders() updateHasOpenBorders()
removeModifier(DiplomaticModifiers.YearsOfPeace)
setFlag(DiplomacyFlags.DeclinedPeace, 10)/// AI won't propose peace for 10 turns setFlag(DiplomacyFlags.DeclinedPeace, 10)/// AI won't propose peace for 10 turns
setFlag(DiplomacyFlags.DeclaredWar, 10) // AI won't agree to trade for 10 turns setFlag(DiplomacyFlags.DeclaredWar, 10) // AI won't agree to trade for 10 turns
removeFlag(DiplomacyFlags.BorderConflict) removeFlag(DiplomacyFlags.BorderConflict)