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

Distinguished notifications of "trade item TO nation has ended" from "trade item FROM nation has ended"

Browse Source
This commit is contained in:
Yair Morgenstern
2019-10-31 15:55:13 +02:00
parent ff731a9c1a
commit 78027ef249
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/Translations/Notifications.json
View File

@ -621,6 +621,10 @@
Russian:"Предложение [tradeOffer] из [otherCivName] завершилось", Russian:"Предложение [tradeOffer] из [otherCivName] завершилось",
Czech:"[tradeOffer] s civilizací [otherCivName] je u konce." Czech:"[tradeOffer] s civilizací [otherCivName] je u konce."
} }
"[tradeOffer] to [otherCivName] has ended":{
}
"One of our trades with [nation] has ended": { "One of our trades with [nation] has ended": {

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 29 targetSdkVersion 29
versionCode 316 versionCode 317
versionName "3.1.11" versionName "3.1.12"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

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

@ -248,7 +248,9 @@ class DiplomacyManager() {
for (offer in trade.ourOffers.union(trade.theirOffers).filter { it.duration > 0 }) { for (offer in trade.ourOffers.union(trade.theirOffers).filter { it.duration > 0 }) {
offer.duration-- offer.duration--
if (offer.duration == 0) { if (offer.duration == 0) {
civInfo.addNotification("[" + offer.name + "] from [$otherCivName] has ended", null, Color.GOLD) if(offer in trade.theirOffers)
civInfo.addNotification("[" + offer.name + "] from [$otherCivName] has ended", null, Color.GOLD)
else civInfo.addNotification("[" + offer.name + "] to [$otherCivName] has ended", null, Color.GOLD)
civInfo.updateStatsForNextTurn() // if they were bringing us gold per turn civInfo.updateStatsForNextTurn() // if they were bringing us gold per turn
civInfo.updateDetailedCivResources() // if they were giving us resources civInfo.updateDetailedCivResources() // if they were giving us resources

6
core/src/com/unciv/models/gamebasics/Translations.kt
View File

@ -43,9 +43,9 @@ class Translations : HashMap<String, TranslationEntry>(){
fun getLanguages(): List<String> { fun getLanguages(): List<String> {
val toReturn = mutableListOf<String>() val toReturn = mutableListOf<String>()
for(value in values) for(entry in values)
for(key in keys) for(languageName in entry.keys)
if(!toReturn.contains(key)) toReturn.add(key) if(!toReturn.contains(languageName)) toReturn.add(languageName)
toReturn.remove("Japanese") // These were for tests but were never actually seriously translated toReturn.remove("Japanese") // These were for tests but were never actually seriously translated
toReturn.remove("Thai") toReturn.remove("Thai")