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

Revert to old CS military rank tribute point logic but retain integer division fix

Browse Source
This commit is contained in:
Loof 2025-09-19 18:33:09 +02:00
parent fde448ec2c
commit d532a111a1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
View File

@ -463,10 +463,11 @@ class CityStateFunctions(val civInfo: Civilization) {
if (!requireWholeList && modifiers.values.sum() < -200) if (!requireWholeList && modifiers.values.sum() < -200)
return modifiers return modifiers
// highest force gets rank=0
val forceRank = civInfo.gameInfo.getAliveMajorCivs().sortedByDescending { it.getStatForRanking( val forceRank = civInfo.gameInfo.getAliveMajorCivs().sortedByDescending { it.getStatForRanking(
RankingType.Force) }.indexOf(demandingCiv) RankingType.Force) }.indexOf(demandingCiv)
val globalModifier = civInfo.gameInfo.ruleset.modOptions.constants.tributeGlobalModifier val globalModifier = civInfo.gameInfo.ruleset.modOptions.constants.tributeGlobalModifier
modifiers["Military Rank"] = globalModifier - forceRank * globalModifier / max(civInfo.gameInfo.gameParameters.players.size-1, 1) modifiers["Military Rank"] = globalModifier * (civInfo.gameInfo.gameParameters.players.size - forceRank) / civInfo.gameInfo.gameParameters.players.size
if (!requireWholeList && modifiers.values.sum() < -100) if (!requireWholeList && modifiers.values.sum() < -100)
return modifiers return modifiers