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

Other civ you're at war with is always at least Enemy, if not Unforgivable

Browse Source
This commit is contained in:
Yair Morgenstern 2019-05-11 23:39:00 +03:00
parent 24a71b16f2
commit cf9194f767
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,7 @@ class DiplomacyManager() {
fun opinionOfOtherCiv() = diplomaticModifiers.values.sum() fun opinionOfOtherCiv() = diplomaticModifiers.values.sum()
fun relationshipLevel(): RelationshipLevel { fun relationshipLevel(): RelationshipLevel {
if(civInfo.isPlayerCivilization() && otherCiv().isPlayerCivilization()) if(civInfo.isPlayerCivilization() && otherCiv().isPlayerCivilization())
return RelationshipLevel.Neutral // People make their own choices. return RelationshipLevel.Neutral // People make their own choices.
@ -107,12 +108,18 @@ class DiplomacyManager() {
// maybe we need to average their views of each other? That makes sense to me. // maybe we need to average their views of each other? That makes sense to me.
val opinion = opinionOfOtherCiv() val opinion = opinionOfOtherCiv()
if(opinion<-80) return RelationshipLevel.Unforgivable
if(opinion<-40) return RelationshipLevel.Enemy
// This is here because when you're at war you can either be enemy OR unforgivable,
// depending on the opinion
if(civInfo.isAtWarWith(otherCiv()))
return RelationshipLevel.Enemy
if(opinion<-15) return RelationshipLevel.Competitor
if(opinion>80) return RelationshipLevel.Ally if(opinion>80) return RelationshipLevel.Ally
if(opinion>40) return RelationshipLevel.Friend if(opinion>40) return RelationshipLevel.Friend
if(opinion>15) return RelationshipLevel.Favorable if(opinion>15) return RelationshipLevel.Favorable
if(opinion<-80) return RelationshipLevel.Unforgivable
if(opinion<-40) return RelationshipLevel.Enemy
if(opinion<-15) return RelationshipLevel.Competitor
return RelationshipLevel.Neutral return RelationshipLevel.Neutral
} }