mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 11:28:03 +07:00
Code Issues Packages Projects Releases Wiki Activity

3.6.14-patch1

Browse Source 
Fixed crash when non-resource trades are made
This commit is contained in:
Yair Morgenstern 2020-03-31 14:15:13 +03:00
parent 93e4888191
commit 4e365acd6b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -33,8 +33,8 @@ allprojects {
version = '1.0.1' version = '1.0.1'
ext { ext {
appName = "Unciv" appName = "Unciv"
appCodeNumber = 402 appCodeNumber = 403
appVersion = "3.6.14" appVersion = "3.6.14-patch1"
gdxVersion = '1.9.10' gdxVersion = '1.9.10'
roboVMVersion = '2.3.1' roboVMVersion = '2.3.1'

18
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -5,6 +5,7 @@ import com.unciv.Constants
import com.unciv.UniqueAbility import com.unciv.UniqueAbility
import com.unciv.logic.civilization.* import com.unciv.logic.civilization.*
import com.unciv.logic.trade.Trade import com.unciv.logic.trade.Trade
import com.unciv.logic.trade.TradeOffer
import com.unciv.logic.trade.TradeType import com.unciv.logic.trade.TradeType
import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.models.ruleset.tile.ResourceSupplyList
import kotlin.math.ceil import kotlin.math.ceil
@ -211,17 +212,16 @@ class DiplomacyManager() {
fun resourcesFromTrade(): ResourceSupplyList { fun resourcesFromTrade(): ResourceSupplyList {
val counter = ResourceSupplyList() val counter = ResourceSupplyList()
val resourcesMap = civInfo.gameInfo.ruleSet.tileResources val resourcesMap = civInfo.gameInfo.ruleSet.tileResources
for(trade in trades){ val isResourceFilter: (TradeOffer) -> Boolean = { it.type == TradeType.Strategic_Resource || it.type == TradeType.Luxury_Resource }
for(offer in trade.ourOffers) for (trade in trades) {
if(offer.type== TradeType.Strategic_Resource || offer.type== TradeType.Luxury_Resource) for (offer in trade.ourOffers.filter(isResourceFilter))
counter.add(resourcesMap[offer.name]!!,-offer.amount,"Trade") counter.add(resourcesMap[offer.name]!!, -offer.amount, "Trade")
for(offer in trade.theirOffers) for (offer in trade.theirOffers.filter(isResourceFilter))
if(offer.type== TradeType.Strategic_Resource || offer.type== TradeType.Luxury_Resource) counter.add(resourcesMap[offer.name]!!, offer.amount, "Trade")
counter.add(resourcesMap[offer.name]!!,offer.amount,"Trade")
} }
for(trade in otherCiv().tradeRequests.filter { it.requestingCiv==civInfo.civName }){ for (trade in otherCiv().tradeRequests.filter { it.requestingCiv == civInfo.civName }) {
for(offer in trade.trade.theirOffers) for (offer in trade.trade.theirOffers.filter(isResourceFilter))
counter.add(resourcesMap[offer.name]!!, -offer.amount, "Trade request") counter.add(resourcesMap[offer.name]!!, -offer.amount, "Trade request")
} }