From d8ec67bb43879039ae604f95944b1692a785a65f Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 6 Nov 2019 21:43:48 +0200 Subject: [PATCH] Resolved #1307 - you no longer get a notification when conneccting to the cities of other Civs New notification when cities have disconnected from your capital --- android/assets/jsons/Translations/Notifications.json | 3 +++ android/build.gradle | 2 +- .../com/unciv/logic/civilization/CivInfoTransientUpdater.kt | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json index 43f939d1d5..054acd6ec6 100644 --- a/android/assets/jsons/Translations/Notifications.json +++ b/android/assets/jsons/Translations/Notifications.json @@ -703,6 +703,9 @@ Russian:"От города [cityName] был проложен путь к столице!" } + "[cityName] has been disconnected from your capital!":{ + } + // Trade "[civName] has accepted your trade request":{ Italian:"[civName] ha accettato la nostra offerta commerciale." diff --git a/android/build.gradle b/android/build.gradle index 1e53c4012a..52f867ce9b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,7 +21,7 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 29 - versionCode 321 + versionCode 322 versionName "3.2.0-patch1" } diff --git a/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt b/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt index 147bd88c0f..1a0081741a 100644 --- a/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt +++ b/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt @@ -136,8 +136,12 @@ class CivInfoTransientUpdater(val civInfo: CivilizationInfo){ if(!initialSetup){ // In the initial setup we're loading an old game state, so it doesn't really count for(city in citiesReachedToMediums.keys) - if(city !in civInfo.citiesConnectedToCapital) + if(city !in civInfo.citiesConnectedToCapital && city.civInfo == civInfo) civInfo.addNotification("[${city.name}] has been connected to your capital!",city.location, Color.GOLD) + + for(city in civInfo.citiesConnectedToCapital) + if(!citiesReachedToMediums.containsKey(city) && city.civInfo==civInfo) + civInfo.addNotification("[${city.name}] has been disconnected from your capital!",city.location, Color.GOLD) } civInfo.citiesConnectedToCapital = citiesReachedToMediums.keys.toList()