diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index e7c0d7e3c4..f45c3c8cbe 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -500,7 +500,11 @@ Russian:"Ваша воинственность для нас неприемлема." Czech:"Vaše chování je pro nás nepřijatelné." German:"Ihr kriegerisches Verhalten ist für uns inakzeptabel." -} + }, + + "We applaud your liberation of conquered cities!": { + + }, "You have captured our cities!":{ Italian:"Hai preso una delle nostre città!" diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index a146797d9a..2b6a45b155 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -420,7 +420,7 @@ class CityInfo { val otherCivsRespecForLiberating = (respecForLiberatingOurCity / 10).roundToInt().toFloat() for (thirdPartyCiv in conqueringCiv.getKnownCivs().filter { it.isMajorCiv() && it != oldOwningCiv }) { thirdPartyCiv.getDiplomacyManager(conqueringCiv) - .addModifier(DiplomaticModifiers.WarMongerer, otherCivsRespecForLiberating) // Cool, keep at at! =D + .addModifier(DiplomaticModifiers.LiberatedCity, otherCivsRespecForLiberating) // Cool, keep at at! =D } } diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index aa16506644..73ce7bf280 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -48,6 +48,7 @@ enum class DiplomaticModifiers{ YearsOfPeace, SharedEnemy, + LiberatedCity, DeclarationOfFriendship, DeclaredFriendshipWithOurAllies, DenouncedOurEnemies, @@ -283,6 +284,7 @@ class DiplomacyManager() { revertToZero(DiplomaticModifiers.RefusedToNotSettleCitiesNearUs, 1 / 4f) revertToZero(DiplomaticModifiers.BetrayedPromiseToNotSettleCitiesNearUs, 1 / 8f) // That's a bastardly thing to do revertToZero(DiplomaticModifiers.UnacceptableDemands, 1 / 4f) + revertToZero(DiplomaticModifiers.LiberatedCity, 1 / 8f) if (!hasFlag(DiplomacyFlags.DeclarationOfFriendship)) revertToZero(DiplomaticModifiers.DeclarationOfFriendship, 1 / 2f) //decreases slowly and will revert to full if it is declared later @@ -327,7 +329,7 @@ class DiplomacyManager() { for(thirdCiv in civInfo.getKnownCivs()){ if(thirdCiv.isAtWarWith(otherCiv)) - thirdCiv.getDiplomacyManager(civInfo).addModifier(DiplomaticModifiers.WarMongerer,5f) + thirdCiv.getDiplomacyManager(civInfo).addModifier(DiplomaticModifiers.SharedEnemy,5f) else thirdCiv.getDiplomacyManager(civInfo).addModifier(DiplomaticModifiers.WarMongerer,-5f) } diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index df48d08745..f9a22db312 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -260,6 +260,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { var text = when (valueOf(modifier.key)) { DeclaredWarOnUs -> "You declared war on us!" WarMongerer -> "Your warmongering ways are unacceptable to us." + LiberatedCity -> "We applaud your liberation of conquered cities!" CapturedOurCities -> "You have captured our cities!" YearsOfPeace -> "Years of peace have strengthened our relations." SharedEnemy -> "Our mutual military struggle brings us closer together."