AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 10:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Gift gold fix (#11972)

Browse Source 
* Fixed evaluateJoinOurWarPlan causing huge gold gift values

* Reverted changes that slipped in

* Changed the motivation from the thirdCivForce to be 1 based

* Removed extra braces
This commit is contained in:
Oskar Niesen 2024-07-18 09:52:49 -05:00 committed by GitHub
parent acb1096615
commit 5c84eebb87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/automation/civilization/DeclareWarPlanEvaluator.kt
View File

@ -114,7 +114,7 @@ object DeclareWarPlanEvaluator {
/**
* How much motivation [civInfo] has for [civToJoin] to join them in their war against [target].
*
* @return The movtivation of the plan. If it is > 0 then we can declare the war.
* @return The movtivation of the plan. If it is >= 0 then we can accept their war offer.
*/
fun evaluateJoinOurWarPlan(civInfo: Civilization, target: Civilization, civToJoin: Civilization, givenMotivation: Float?): Float {
if (civInfo.getDiplomacyManager(civToJoin)!!.isRelationshipLevelLT(RelationshipLevel.Favorable)) return -1000f
@ -126,12 +126,15 @@ object DeclareWarPlanEvaluator {
val targetForce = target.getStatForRanking(RankingType.Force)
val civForce = civInfo.getStatForRanking(RankingType.Force)
// They need to be at least half the targets size
// If we have more force than all enemies and overpower this enemy then we don't need help
if (civForce - civInfo.threatManager.getCombinedForceOfWarringCivs() > targetForce * 2) return 0f
// They should to be at least half the targets size
val thirdCivForce = (civToJoin.getStatForRanking(RankingType.Force) - 0.8f * civToJoin.getCivsAtWarWith().sumOf { it.getStatForRanking(RankingType.Force) }).coerceAtLeast(100f)
motivation += 20 * thirdCivForce / targetForce.toFloat().coerceAtMost(40f)
motivation += (20 * (1 - thirdCivForce / targetForce.toFloat())).coerceAtMost(40f)
// If we have less relative force then the target then we have more motivation to accept
motivation += 30 * (1 - (civForce / targetForce.toFloat())).coerceIn(-30f, 30f)
motivation += 20 * (1 - civForce / targetForce.toFloat()).coerceIn(-40f, 40f)
return motivation - 20
}