diff --git a/changelog.md b/changelog.md index c104331af7..3505e84c98 100644 --- a/changelog.md +++ b/changelog.md @@ -16,10 +16,6 @@ Buildings that are missing resources are still displayed in city constructions Unit 'unbuildable' parameter converted to unique -By vainiovano: - -Fix Gradle deprecation warnings - By alkorolyov: - Spectator can view other civ stats: Tech, Trades, Cities, Units, Gold diff --git a/core/src/com/unciv/logic/trade/TradeLogic.kt b/core/src/com/unciv/logic/trade/TradeLogic.kt index 93b09c197e..2c5cef30fd 100644 --- a/core/src/com/unciv/logic/trade/TradeLogic.kt +++ b/core/src/com/unciv/logic/trade/TradeLogic.kt @@ -41,7 +41,7 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci if (!civInfo.isOneCityChallenger() && !otherCivilization.isOneCityChallenger() && !civInfo.isCityState() && !otherCivilization.isCityState()) { - for (city in civInfo.cities.filterNot { it.isCapital() }) + for (city in civInfo.cities.filterNot { it.isCapital() || it.isInResistance() }) offers.add(TradeOffer(city.id, TradeType.City)) }