diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json index eb94a3c263..bdc77dbb08 100644 --- a/android/assets/jsons/Translations/Notifications.json +++ b/android/assets/jsons/Translations/Notifications.json @@ -133,6 +133,8 @@ Portuguese:"o(a) [construction] foi construirdo em [cityName]" Japanese:"[construction]は[cityName]に建てられました" } + + "[wonder] has been built in a faraway land":{} "Work has started on [construction]":{ Italian:"Sono iniziati i lavori per [construction]" @@ -226,6 +228,9 @@ Portuguese:"Um(a) [unit] inimigo(a) atacout nossa [ourUnit]" Japanese:"敵[unit]が私たちの[ourUnit]を攻撃しました" } + + "Enemy city [cityName] has attacked our [ourUnit]":{} + "An enemy [unit] has captured [cityname]":{ Italian:"Un'unità nemica [unit] ha conquistato [cityname]" Russian:"Вражеский [unit] захватил [cityname]" @@ -264,6 +269,8 @@ Portuguese:"Um(a) [unit] inimigo(a) destruiu nosso(a) [ourUnit]" Japanese:"敵[unit]が私たちの[ourUnit]を破壊しました" } + + "Enemy city [cityName] has destroyed our [ourUnit]":{} "An enemy [unit] was destroyed while attacking [cityname]":{ Italian:"Un'unità nemica [unit] è stata distrutta mentre attaccava [cityname]" diff --git a/android/build.gradle b/android/build.gradle index bb4a227188..8c852e6dc1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 244 - versionName "2.16.7" + versionCode 245 + versionName "2.16.8" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index 4026880234..d68fe7f22b 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -182,8 +182,11 @@ class CityConstructions { if (construction is Building && construction.isWonder && construction.requiredBuildingInAllCities == null) { for (civ in cityInfo.civInfo.gameInfo.civilizations) { - val builtLocation = if (civ.exploredTiles.contains(cityInfo.location)) cityInfo.name else "a faraway land" - civ.addNotification("[$currentConstruction] has been built in [$builtLocation]", cityInfo.location, Color.BROWN) + if (civ.exploredTiles.contains(cityInfo.location)) + civ.addNotification("[$currentConstruction] has been built in [${cityInfo.name}]", cityInfo.location, Color.BROWN) + else + civ.addNotification("[$currentConstruction] has been built in a faraway land",null,Color.BROWN) + } } else cityInfo.civInfo.addNotification("[$currentConstruction] has been built in [" + cityInfo.name + "]", cityInfo.location, Color.BROWN)