mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-30 22:58:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #11886 - Friendship-based modifiers calculated correctly

Browse Source
This commit is contained in:
yairm210
2024-07-07 14:50:31 +03:00
parent 95bc8d09d1
commit 8b4d5195a3
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt
View File

@ -247,7 +247,6 @@ object SpecificUnitAutomation {
}
// if we got here, we're pretty close, start looking!
val localUniqueCache = LocalUniqueCache()
val chosenTile = applicableTiles.sortedByDescending {
Automation.rankTile(
it,

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

@ -556,15 +556,18 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
internal fun setFriendshipBasedModifier() {
removeModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies)
removeModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies)
for (thirdCiv in getCommonKnownCivs()
.filter { it.getDiplomacyManager(civInfo)!!.hasFlag(DiplomacyFlags.DeclarationOfFriendship) }) {
val civsOtherCivHasDeclaredFriendshipWith = getCommonKnownCivs()
.filter { it.getDiplomacyManager(otherCiv())!!.hasFlag(DiplomacyFlags.DeclarationOfFriendship) }
val relationshipLevel = otherCiv().getDiplomacyManager(thirdCiv)!!.relationshipIgnoreAfraid()
val modifierType = when (relationshipLevel) {
for (thirdCiv in civsOtherCivHasDeclaredFriendshipWith) {
// What do we (A) think about the otherCiv() (B) being friends with the third Civ (C)?
val ourRelationshipWithThirdCiv = civInfo.getDiplomacyManager(thirdCiv)!!.relationshipIgnoreAfraid()
val modifierType = when (ourRelationshipWithThirdCiv) {
RelationshipLevel.Unforgivable, RelationshipLevel.Enemy -> DiplomaticModifiers.DeclaredFriendshipWithOurEnemies
else -> DiplomaticModifiers.DeclaredFriendshipWithOurAllies
}
val modifierValue = when (relationshipLevel) {
val modifierValue = when (ourRelationshipWithThirdCiv) {
RelationshipLevel.Unforgivable -> -15f
RelationshipLevel.Enemy -> -5f
RelationshipLevel.Friend -> 5f