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

Liberate civ open borders fix (#10150)

Browse Source 
* Liberating a city from a destroyed Civ now gives open borders

* Conquering civ no longer offers open borders to the civ being liberated.
This commit is contained in:
Oskar Niesen 2023-09-21 06:59:22 -05:00 committed by GitHub
parent 0d942ac175
commit 5a8f18f726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
View File

@ -234,6 +234,9 @@ class CityConquestFunctions(val city: City){
if (foundingCiv.isMajorCiv()) { if (foundingCiv.isMajorCiv()) {
foundingCiv.getDiplomacyManager(conqueringCiv) foundingCiv.getDiplomacyManager(conqueringCiv)
.addModifier(DiplomaticModifiers.CapturedOurCities, respectForLiberatingOurCity) .addModifier(DiplomaticModifiers.CapturedOurCities, respectForLiberatingOurCity)
val openBordersTrade = TradeLogic(foundingCiv, conqueringCiv)
openBordersTrade.currentTrade.ourOffers.add(TradeOffer(Constants.openBorders, TradeType.Agreement))
openBordersTrade.acceptTrade()
} else { } else {
//Liberating a city state gives a large amount of influence, and peace //Liberating a city state gives a large amount of influence, and peace
foundingCiv.getDiplomacyManager(conqueringCiv).setInfluence(90f) foundingCiv.getDiplomacyManager(conqueringCiv).setInfluence(90f)