AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Strategic resources cost more in trade from a civ who's at war and can use them for units

Browse Source
This commit is contained in:
Yair Morgenstern 2019-05-13 22:23:30 +03:00
parent 5463e36cca
commit 48af218795
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Translations/Units,Promotions.json
View File

@ -698,7 +698,7 @@
} }
"Bonus vs Mounted 33%":{ "Bonus vs Mounted 33%":{
Italian:"+33% Bonus contro unità a cavallo Italian:"+33% Bonus contro unità a cavallo"
Simplified_Chinese:"对战骑乘单位时+33%战斗力" Simplified_Chinese:"对战骑乘单位时+33%战斗力"
} }

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 240 versionCode 241
versionName "2.16.4" versionName "2.16.5"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

25
core/src/com/unciv/logic/trade/TradeEvaluation.kt
View File

@ -133,7 +133,30 @@ class TradeEvaluation{
return 250 // fair price return 250 // fair price
else return 500 // you want to take away our last lux of this type?! else return 500 // you want to take away our last lux of this type?!
} }
TradeType.Strategic_Resource -> return 50*offer.amount TradeType.Strategic_Resource -> {
if(!civInfo.isAtWar()) return 50*offer.amount
val canUseForUnits = GameBasics.Units.values
.any { it.requiredResource==offer.name && it.isBuildable(civInfo) }
if(!canUseForUnits) return 50*offer.amount
val amountLeft = civInfo.getCivResourcesByName()[offer.name]!!
// Each strategic resource starts costing 100 more when we ass the 5 resources baseline
// That is to say, if I have 4 and you take one away, that's 200
// take away the third, that's 300, 2nd 400, 1st 500
// So if he had 5 left, and we want to buy 2, then we want to buy his 5th and 4th last resources,
// So we'll calculate how much he'll sell his 4th for (200) and his 5th for (100)
var totalCost = 0
// I know it's confusing, you're welcome to change to a more understandable way of counting if you can think of one...
for(numberOfResource in (amountLeft-offer.amount+1)..amountLeft){
if(numberOfResource>5) totalCost+=100
else totalCost += (6-numberOfResource) * 100
}
return totalCost
}
TradeType.Technology -> return sqrt(GameBasics.Technologies[offer.name]!!.cost.toDouble()).toInt()*20 TradeType.Technology -> return sqrt(GameBasics.Technologies[offer.name]!!.cost.toDouble()).toInt()*20
TradeType.Introduction -> return 250 TradeType.Introduction -> return 250
TradeType.WarDeclaration -> { TradeType.WarDeclaration -> {