wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #2838 - cities in resistance can no longer be traded

Browse source
This commit is contained in:
Yair Morgenstern 2020-07-24 11:55:10 +03:00
parent 7bf705236c
commit 56052884f1
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog.md
View file

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

2
core/src/com/unciv/logic/trade/TradeLogic.kt
View file

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