From 0da8cbd607b8f5dbfcd9dc0339f98a9f08417957 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 21 Mar 2020 21:27:47 +0200 Subject: [PATCH] Removed "Declare war on X" trade option when there's an active peace treaty --- .../unciv/logic/civilization/diplomacy/DiplomacyManager.kt | 4 ++-- core/src/com/unciv/logic/trade/TradeLogic.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 1195844646..b24eda4470 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -184,9 +184,9 @@ class DiplomacyManager() { return 0 } - fun canDeclareWar() = (turnsToPeaceTreaty()==0 && diplomaticStatus != DiplomaticStatus.War) + fun canDeclareWar() = turnsToPeaceTreaty()==0 && diplomaticStatus != DiplomaticStatus.War //Used for nuke - fun canAttack() = (turnsToPeaceTreaty()==0) + fun canAttack() = turnsToPeaceTreaty()==0 fun goldPerTurn():Int{ var goldPerTurnForUs = 0 diff --git a/core/src/com/unciv/logic/trade/TradeLogic.kt b/core/src/com/unciv/logic/trade/TradeLogic.kt index 73d23e7639..4d396c4706 100644 --- a/core/src/com/unciv/logic/trade/TradeLogic.kt +++ b/core/src/com/unciv/logic/trade/TradeLogic.kt @@ -17,7 +17,7 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci fun getAvailableOffers(civInfo: CivilizationInfo, otherCivilization: CivilizationInfo): TradeOffersList { val offers = TradeOffersList() if (civInfo.isCityState() && otherCivilization.isCityState()) return offers - if(civInfo.isAtWarWith(otherCivilization)) + if (civInfo.isAtWarWith(otherCivilization)) offers.add(TradeOffer(Constants.peaceTreaty, TradeType.Treaty)) if(!otherCivilization.getDiplomacyManager(civInfo).hasOpenBorders @@ -65,7 +65,7 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci val civsWeBothKnow = otherCivsWeKnow .filter { otherCivilization.diplomacy.containsKey(it.civName) } val civsWeArentAtWarWith = civsWeBothKnow - .filter { civInfo.getDiplomacyManager(it).diplomaticStatus == DiplomaticStatus.Peace } + .filter { civInfo.getDiplomacyManager(it).canDeclareWar() } for (thirdCiv in civsWeArentAtWarWith) { offers.add(TradeOffer(thirdCiv.civName, TradeType.WarDeclaration)) }