mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-24 06:39:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed "Declare war on X" trade option when there's an active peace treaty

Browse Source
This commit is contained in:
Yair Morgenstern
2020-03-21 21:27:47 +02:00
parent b28a247bd0
commit 0da8cbd607
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

4
core/src/com/unciv/logic/trade/TradeLogic.kt
View File

@ -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))
}