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

City-states make peace with enemies when their alllies do

Browse Source
This commit is contained in:
Yair Morgenstern 2020-12-19 21:01:35 +02:00
parent d56433857b
commit 478ea310b4
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -522,9 +522,24 @@ class DiplomacyManager() {
}
}
fun makePeace() {
/** Should only be called from makePeace */
private fun makePeaceOneSide() {
diplomaticStatus = DiplomaticStatus.Peace
otherCivDiplomacy().diplomaticStatus = DiplomaticStatus.Peace
val otherCiv = otherCiv()
// Get out of others' territory
for (unit in civInfo.getCivUnits().filter { it.getTile().getOwner() == otherCiv })
unit.movement.teleportToClosestMoveableTile()
// Our ally city states make peace with us
for (thirdCiv in civInfo.getKnownCivs())
if (thirdCiv.getAllyCiv() == civInfo.civName && thirdCiv.isAtWarWith(otherCiv))
thirdCiv.getDiplomacyManager(otherCiv).makePeace()
}
fun makePeace() {
makePeaceOneSide()
otherCivDiplomacy().makePeaceOneSide()
for (civ in getCommonKnownCivs()) {
civ.addNotification(
@ -533,15 +548,6 @@ class DiplomacyManager() {
Color.WHITE
)
}
val otherCiv = otherCiv()
// We get out of their territory
for (unit in civInfo.getCivUnits().filter { it.getTile().getOwner() == otherCiv })
unit.movement.teleportToClosestMoveableTile()
// And we get out of theirs
for (unit in otherCiv.getCivUnits().filter { it.getTile().getOwner() == civInfo })
unit.movement.teleportToClosestMoveableTile()
}
fun hasFlag(flag:DiplomacyFlags) = flagsCountdown.containsKey(flag.name)