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

Fix trade resources check.

Browse source
This commit is contained in:
Duan Tao 2019-09-19 14:02:25 +08:00 committed by Yair Morgenstern
parent 2def82c4a6
commit c4e4f3d2a3
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View file

@ -170,11 +170,6 @@ class DiplomacyManager() {
if(offer.type== TradeType.Strategic_Resource || offer.type== TradeType.Luxury_Resource)
counter.add(GameBasics.TileResources[offer.name]!!,offer.amount,"Trade")
}
for(tradeRequest in otherCiv().tradeRequests.filter { it.requestingCiv==civInfo.civName }){
for(offer in tradeRequest.trade.theirOffers) // "theirOffers" in the other civ's trade request, is actually out civ's offers
if(offer.type== TradeType.Strategic_Resource || offer.type== TradeType.Luxury_Resource)
counter.add(GameBasics.TileResources[offer.name]!!,-offer.amount,"Trade")
}
return counter
}
//endregion