From 7998ed2f0c7009b36bce7da1c912f1610e98decf Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 26 Nov 2019 20:55:07 +0200 Subject: [PATCH] Resolved #1365 - Disabled trading cities in One City Challenge --- core/src/com/unciv/logic/trade/TradeLogic.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/trade/TradeLogic.kt b/core/src/com/unciv/logic/trade/TradeLogic.kt index dd7092a94a..62d48000cc 100644 --- a/core/src/com/unciv/logic/trade/TradeLogic.kt +++ b/core/src/com/unciv/logic/trade/TradeLogic.kt @@ -44,7 +44,9 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci offers.add(TradeOffer("Gold".tr(), TradeType.Gold, 0, civInfo.gold)) offers.add(TradeOffer("Gold per turn".tr(), TradeType.Gold_Per_Turn, 30, civInfo.statsForNextTurn.gold.toInt())) - if (!civInfo.isCityState() && !otherCivilization.isCityState()) { + + if (!civInfo.isOneCityChallenger() && !otherCivilization.isOneCityChallenger() + && !civInfo.isCityState() && !otherCivilization.isCityState()) { for (city in civInfo.cities.filterNot { it.isCapital() }) offers.add(TradeOffer(city.name, TradeType.City, 0)) }