From c4e4f3d2a31a3ac88b437192d6743f9cbcdd9f96 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Thu, 19 Sep 2019 14:02:25 +0800 Subject: [PATCH] Fix trade resources check. --- .../unciv/logic/civilization/diplomacy/DiplomacyManager.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 4c01f481de..5b45e37d44 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -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