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

Civs can no longer declare war right after peace with a city-state (#11762)

Browse Source 
* Signing peace with a civ and a city state adds a peace treaty with the city-state

* Added a comment
This commit is contained in:
Oskar Niesen 2024-06-19 09:13:36 -05:00 committed by GitHub
parent fec30364a9
commit 2d2b730399
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import com.unciv.logic.civilization.NotificationCategory
import com.unciv.logic.civilization.NotificationIcon
import com.unciv.logic.trade.Trade
import com.unciv.logic.trade.TradeEvaluation
import com.unciv.logic.trade.TradeLogic
import com.unciv.logic.trade.TradeOffer
import com.unciv.logic.trade.TradeType
import com.unciv.models.ruleset.tile.ResourceSupplyList
@ -471,8 +472,17 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
for (thirdCiv in civInfo.getKnownCivs()) {
// Our ally city states make peace with us
if (thirdCiv.getAllyCiv() == civInfo.civName && thirdCiv.isAtWarWith(otherCiv))
thirdCiv.getDiplomacyManager(otherCiv)!!.makePeace()
if (thirdCiv.getAllyCiv() == civInfo.civName && thirdCiv.isAtWarWith(otherCiv)) {
val thirdCivDiplo = thirdCiv.getDiplomacyManager(otherCiv)!!
thirdCivDiplo.makePeace()
// Make the peace treaty so that the civ can't declare war immedietly
val tradeLogic = TradeLogic(thirdCiv, otherCiv)
tradeLogic.currentTrade.ourOffers.add(TradeOffer(Constants.peaceTreaty, TradeType.Treaty))
tradeLogic.currentTrade.theirOffers.add(TradeOffer(Constants.peaceTreaty, TradeType.Treaty))
thirdCivDiplo.trades.add(tradeLogic.currentTrade)
thirdCivDiplo.otherCivDiplomacy().trades.add(tradeLogic.currentTrade.reverse())
}
// Other City-States that are not our ally don't like the fact that we made peace with their enemy
if (thirdCiv.getAllyCiv() != civInfo.civName && thirdCiv.isAtWarWith(otherCiv))
thirdCiv.getDiplomacyManager(civInfo)!!.addInfluence(-10f)