mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-28 05:39:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added denunceation

Browse Source
This commit is contained in:
Yair Morgenstern
2019-06-01 23:20:02 +03:00
parent f60ebbb7e1
commit 36da3359db
3 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
android/assets/jsons/Translations/Other.json
View File

@ -2589,6 +2589,14 @@
Portuguese:"Perfeito!"
}
// Denunceation flavour texts
"Denounce ([numberOfTurns] turns)":{
}
"We will remember this.":{
}
// Relationship states, from worst (Unforgivable) to best (Ally)
"Unforgivable":{
@ -2729,11 +2737,19 @@
}
"Your so-called 'friendship' is worth nothing.":{ // When we have a decleration of friendship to someone and we declare war on them
Italian:"La tua cosiddetta 'amicizia' non vale nulla!"
Italian:"La tua cosiddetta 'amicizia' non vale nulla!"
Portuguese:"Sua chamada 'amizade' não vale nada."
}
"You have publically denounced us!":{
}
"You have denounced our allies":{
}
"You have denounced our enemies":{
}
////// Overview screen

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

@ -27,6 +27,7 @@ enum class DiplomacyFlags{
DeclinedPeace,
DeclaredWar,
DeclarationOfFriendship,
Denunceation,
BorderConflict
}
@ -36,11 +37,14 @@ enum class DiplomaticModifiers{
CapturedOurCities,
DeclaredFriendshipWithOurEnemies,
BetrayedDeclarationOfFriendship,
Denunciation,
DenouncedOurAllies,
YearsOfPeace,
SharedEnemy,
DeclarationOfFriendship,
DeclaredFriendshipWithOurAllies,
DenouncedOurEnemies,
OpenBorders
}
@ -219,8 +223,10 @@ class DiplomacyManager() {
removeUntenebleTrades()
updateHasOpenBorders()
if(diplomaticStatus==DiplomaticStatus.Peace)
addModifier(DiplomaticModifiers.YearsOfPeace,0.5f)
if(diplomaticStatus==DiplomaticStatus.Peace) {
if(diplomaticModifiers[DiplomaticModifiers.YearsOfPeace.name]!! < 30)
addModifier(DiplomaticModifiers.YearsOfPeace, 0.5f)
}
else revertToZero(DiplomaticModifiers.YearsOfPeace,-0.5f) // war makes you forget the good ol' days
var openBorders = 0
@ -351,12 +357,30 @@ class DiplomacyManager() {
if(thirdCiv==otherCiv() || !thirdCiv.knows(otherCivName)) continue
val thirdCivRelationshipWithOtherCiv = thirdCiv.getDiplomacyManager(otherCiv()).relationshipLevel()
when(thirdCivRelationshipWithOtherCiv){
RelationshipLevel.Unforgivable -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies,15f)
RelationshipLevel.Enemy -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies,5f)
RelationshipLevel.Unforgivable -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies,-15f)
RelationshipLevel.Enemy -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurEnemies,-5f)
RelationshipLevel.Friend -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies,5f)
RelationshipLevel.Ally -> addModifier(DiplomaticModifiers.DeclaredFriendshipWithOurAllies,15f)
}
}
}
fun denounce(){
setModifier(DiplomaticModifiers.Denunciation,-35f)
otherCivDiplomacy().setModifier(DiplomaticModifiers.Denunciation,-35f)
setFlag(DiplomacyFlags.Denunceation,30)
otherCivDiplomacy().setFlag(DiplomacyFlags.Denunceation,30)
for(thirdCiv in civInfo.getKnownCivs().filter { it.isMajorCiv() }){
if(thirdCiv==otherCiv() || !thirdCiv.knows(otherCivName)) continue
val thirdCivRelationshipWithOtherCiv = thirdCiv.getDiplomacyManager(otherCiv()).relationshipLevel()
when(thirdCivRelationshipWithOtherCiv){
RelationshipLevel.Unforgivable -> addModifier(DiplomaticModifiers.DenouncedOurEnemies,15f)
RelationshipLevel.Enemy -> addModifier(DiplomaticModifiers.DenouncedOurEnemies,5f)
RelationshipLevel.Friend -> addModifier(DiplomaticModifiers.DenouncedOurAllies,-5f)
RelationshipLevel.Ally -> addModifier(DiplomaticModifiers.DenouncedOurAllies,-15f)
}
}
}
//endregion
}

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

@ -209,6 +209,15 @@ class DiplomacyScreen:CameraStageBaseScreen() {
diplomacyTable.add(declareFriendshipButton).row()
}
if(!diplomacyManager.hasFlag(DiplomacyFlags.Denunceation)){
val denounceButton = TextButton("Denounce ([30] turns)".tr(),skin)
denounceButton.onClick {
diplomacyManager.denounce()
setRightSideFlavorText(otherCiv,"We will remember this.".tr(),"Very well.".tr())
}
diplomacyTable.add(denounceButton).row()
}
val declareWarButton = getDeclareWarButton(diplomacyManager, otherCiv)
diplomacyTable.add(declareWarButton).row()
}
@ -229,6 +238,9 @@ class DiplomacyScreen:CameraStageBaseScreen() {
DeclaredFriendshipWithOurAllies -> "You have declared friendship with our allies"
OpenBorders -> "Our open borders have brought us closer together."
BetrayedDeclarationOfFriendship -> "Your so-called 'friendship' is worth nothing."
Denunciation -> "You have publically denounced us!"
DenouncedOurAllies -> "You have denounced our allies"
DenouncedOurEnemies -> "You have denounced our enemies"
}
text = text.tr() + " "
if (modifier.value > 0) text += "+"