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

AI will only pay for extra luxuries if it can trade them away

Browse Source
This commit is contained in:
Yair Morgenstern
2018-11-12 09:47:43 +02:00
parent e43cd0ae6b
commit d3a4952fef
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 26
versionCode 157 versionCode 158
versionName "2.9.9" versionName "2.9.10"
} }
buildTypes { buildTypes {
release { release {

19
core/src/com/unciv/logic/trade/TradeLogic.kt
View File

@ -6,6 +6,7 @@ import com.unciv.logic.civilization.DiplomaticStatus
import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tile.ResourceType import com.unciv.models.gamebasics.tile.ResourceType
import com.unciv.ui.utils.tr import com.unciv.ui.utils.tr
import kotlin.math.min
import kotlin.math.sqrt import kotlin.math.sqrt
class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: CivilizationInfo){ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: CivilizationInfo){
@ -64,12 +65,22 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci
return value return value
} }
else{ else{
var value = 50*offer.amount // they'll buy at 50 each only, and that's so they can trade it away val civsWhoWillTradeUsForTheLux = ourCivilization.diplomacy.values.map { it.civInfo }
if(!theirAvailableOffers.any { it.name==offer.name }) .filter { it!= otherCivilization }
value+=250 // only if they're lacking will they buy the first one at 300 .filter { it.getCivResources().keys.none { it.name==offer.name } } //they don't have
return value val ourResourceNames = ourCivilization.getCivResources().map { it.key.name }
val civsWithLuxToTrade = civsWhoWillTradeUsForTheLux.filter {
it.getCivResources().any {
it.value > 1 && it.key.resourceType == ResourceType.Luxury //they have a lux we don't and will be willing to trade it
&& !ourResourceNames.contains(it.key.name)
}
} }
var value = 50*min(offer.amount,civsWithLuxToTrade.size) // they'll buy at 50 each only, and that's so they can trade it away
if(!theirAvailableOffers.any { it.name==offer.name })
value+=300 // only if they're lacking will they buy the first one at 300
return value
}
} }
TradeType.Technology -> return sqrt(GameBasics.Technologies[offer.name]!!.cost.toDouble()).toInt()*10 TradeType.Technology -> return sqrt(GameBasics.Technologies[offer.name]!!.cost.toDouble()).toInt()*10
TradeType.Strategic_Resource -> { TradeType.Strategic_Resource -> {