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

Added "relationship" dependant on the modifiers - this will be the main way we apply user actions to AI consequences

Browse Source
This commit is contained in:
Yair Morgenstern 2019-05-01 00:13:41 +03:00
parent 5952056518
commit b4fc129a9b
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,16 @@ import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tile.TileResource import com.unciv.models.gamebasics.tile.TileResource
import com.unciv.models.gamebasics.tr import com.unciv.models.gamebasics.tr
enum class RelationshipLevel{
Unforgivable,
Enemy,
Competitor,
Neutral,
Favorable,
Friend,
Ally
}
enum class DiplomacyFlags{ enum class DiplomacyFlags{
DeclinedLuxExchange, DeclinedLuxExchange,
DeclinedPeace DeclinedPeace
@ -75,6 +85,17 @@ class DiplomacyManager() {
fun opinionOfOtherCiv() = diplomaticModifiers.values.sum() fun opinionOfOtherCiv() = diplomaticModifiers.values.sum()
fun relationshipLevel(): RelationshipLevel {
val opinion = opinionOfOtherCiv()
if(opinion>80) return RelationshipLevel.Ally
if(opinion>40) return RelationshipLevel.Friend
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
}
fun canDeclareWar() = (turnsToPeaceTreaty()==0 && diplomaticStatus != DiplomaticStatus.War) fun canDeclareWar() = (turnsToPeaceTreaty()==0 && diplomaticStatus != DiplomaticStatus.War)

3
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -116,7 +116,8 @@ class DiplomacyScreen:CameraStageBaseScreen() {
if(!otherCiv.isCityState()){ if(!otherCiv.isCityState()){
val diplomacyModifiersTable = Table() val diplomacyModifiersTable = Table()
val otherCivDiplomacyManager = otherCiv.getDiplomacyManager(currentPlayerCiv) val otherCivDiplomacyManager = otherCiv.getDiplomacyManager(currentPlayerCiv)
diplomacyModifiersTable.add(("Current opinion: "+otherCivDiplomacyManager.opinionOfOtherCiv()).toLabel()).row() val relationshipText = "Our relationship: "+otherCivDiplomacyManager.relationshipLevel()+" ("+otherCivDiplomacyManager.opinionOfOtherCiv()+")"
diplomacyModifiersTable.add(relationshipText.toLabel()).row()
for(modifier in otherCivDiplomacyManager.diplomaticModifiers){ for(modifier in otherCivDiplomacyManager.diplomaticModifiers){
diplomacyModifiersTable.add((modifier.key+" "+modifier.value).toLabel()).row() diplomacyModifiersTable.add((modifier.key+" "+modifier.value).toLabel()).row()
} }