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

Fixed "Positive" diplomatic modifier for warmongering

Browse Source
This commit is contained in:
Yair Morgenstern 2019-12-03 21:28:50 +02:00
parent 87a746f79b
commit ef272b3208
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
View File

@ -500,7 +500,11 @@
Russian:"Ваша воинственность для нас неприемлема." Russian:"Ваша воинственность для нас неприемлема."
Czech:"Vaše chování je pro nás nepřijatelné." Czech:"Vaše chování je pro nás nepřijatelné."
German:"Ihr kriegerisches Verhalten ist für uns inakzeptabel." German:"Ihr kriegerisches Verhalten ist für uns inakzeptabel."
} },
"We applaud your liberation of conquered cities!": {
},
"You have captured our cities!":{ "You have captured our cities!":{
Italian:"Hai preso una delle nostre città!" Italian:"Hai preso una delle nostre città!"

2
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -420,7 +420,7 @@ class CityInfo {
val otherCivsRespecForLiberating = (respecForLiberatingOurCity / 10).roundToInt().toFloat() val otherCivsRespecForLiberating = (respecForLiberatingOurCity / 10).roundToInt().toFloat()
for (thirdPartyCiv in conqueringCiv.getKnownCivs().filter { it.isMajorCiv() && it != oldOwningCiv }) { for (thirdPartyCiv in conqueringCiv.getKnownCivs().filter { it.isMajorCiv() && it != oldOwningCiv }) {
thirdPartyCiv.getDiplomacyManager(conqueringCiv) thirdPartyCiv.getDiplomacyManager(conqueringCiv)
.addModifier(DiplomaticModifiers.WarMongerer, otherCivsRespecForLiberating) // Cool, keep at at! =D .addModifier(DiplomaticModifiers.LiberatedCity, otherCivsRespecForLiberating) // Cool, keep at at! =D
} }
} }

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

@ -48,6 +48,7 @@ enum class DiplomaticModifiers{
YearsOfPeace, YearsOfPeace,
SharedEnemy, SharedEnemy,
LiberatedCity,
DeclarationOfFriendship, DeclarationOfFriendship,
DeclaredFriendshipWithOurAllies, DeclaredFriendshipWithOurAllies,
DenouncedOurEnemies, DenouncedOurEnemies,
@ -283,6 +284,7 @@ class DiplomacyManager() {
revertToZero(DiplomaticModifiers.RefusedToNotSettleCitiesNearUs, 1 / 4f) revertToZero(DiplomaticModifiers.RefusedToNotSettleCitiesNearUs, 1 / 4f)
revertToZero(DiplomaticModifiers.BetrayedPromiseToNotSettleCitiesNearUs, 1 / 8f) // That's a bastardly thing to do revertToZero(DiplomaticModifiers.BetrayedPromiseToNotSettleCitiesNearUs, 1 / 8f) // That's a bastardly thing to do
revertToZero(DiplomaticModifiers.UnacceptableDemands, 1 / 4f) revertToZero(DiplomaticModifiers.UnacceptableDemands, 1 / 4f)
revertToZero(DiplomaticModifiers.LiberatedCity, 1 / 8f)
if (!hasFlag(DiplomacyFlags.DeclarationOfFriendship)) if (!hasFlag(DiplomacyFlags.DeclarationOfFriendship))
revertToZero(DiplomaticModifiers.DeclarationOfFriendship, 1 / 2f) //decreases slowly and will revert to full if it is declared later 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()){ for(thirdCiv in civInfo.getKnownCivs()){
if(thirdCiv.isAtWarWith(otherCiv)) 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) else thirdCiv.getDiplomacyManager(civInfo).addModifier(DiplomaticModifiers.WarMongerer,-5f)
} }

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

@ -260,6 +260,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
var text = when (valueOf(modifier.key)) { var text = when (valueOf(modifier.key)) {
DeclaredWarOnUs -> "You declared war on us!" DeclaredWarOnUs -> "You declared war on us!"
WarMongerer -> "Your warmongering ways are unacceptable to us." WarMongerer -> "Your warmongering ways are unacceptable to us."
LiberatedCity -> "We applaud your liberation of conquered cities!"
CapturedOurCities -> "You have captured our cities!" CapturedOurCities -> "You have captured our cities!"
YearsOfPeace -> "Years of peace have strengthened our relations." YearsOfPeace -> "Years of peace have strengthened our relations."
SharedEnemy -> "Our mutual military struggle brings us closer together." SharedEnemy -> "Our mutual military struggle brings us closer together."