From 99959c9937760ad210e6a29d57728cfb3f8f8fca Mon Sep 17 00:00:00 2001 From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com> Date: Tue, 10 Sep 2019 22:41:45 +0800 Subject: [PATCH 1/4] delete one english selectlanguage because menu have two choice, enlarge overview's image icon because it's too small to align. (#1058) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * systemProp * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * fix that researched tech can be picked when we pick a free tech * update to master * update * Update TechPickerScreen.kt * delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align. * update * language polish is wrong to be writing "polski" * 显示教程 --- android/assets/jsons/Nations_Simplified_Chinese.json | 4 ++-- android/assets/jsons/Translations/Buildings.json | 2 +- .../assets/jsons/Translations/Diplomacy,Trade,Nations.json | 2 +- .../jsons/Translations/NewGame,SaveGame,LoadGame,Options.json | 4 ++++ android/assets/jsons/Translations/Other.json | 2 +- android/assets/jsons/Translations/Techs.json | 2 +- .../assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json | 2 +- core/src/com/unciv/models/gamebasics/Translations.kt | 2 +- core/src/com/unciv/ui/EmpireOverviewScreen.kt | 4 ++-- 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/android/assets/jsons/Nations_Simplified_Chinese.json b/android/assets/jsons/Nations_Simplified_Chinese.json index d8dd19ea07..f1e94589a9 100644 --- a/android/assets/jsons/Nations_Simplified_Chinese.json +++ b/android/assets/jsons/Nations_Simplified_Chinese.json @@ -84,7 +84,7 @@ introduction:"你好，我是女皇帝武则天。中国追求和平以谋求自身发展。人不犯我，我不犯人。", neutralHello:"今日天朗气清，惠风和畅，阁下所为何来？", - neutralLetsHearIt:["请仔细道来。","所为何事?","朕姑且听之。"], + neutralLetsHearIt:["请仔细道来。","所为何事？","朕姑且听之。"], neutralNo:["不可。","不可行。","此事断不可行。"], neutralYes:["朕允了。","此事就依阁下所请。","好的，阁下真是快人快语。"], @@ -338,7 +338,7 @@ neutralYes:["很好。","好的。","当然可以。"], hateHello:"你好。", - hateLetsHearIt:["继续。","你说什么?"], + hateLetsHearIt:["继续。","你说什么？"], hateNo:["绝对不行。","我拒绝。","我想你不是认真的。"], hateYes:["很好。","我决定接受。","成交。","好的。"], diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index ed4bb887ed..345f5ad5a6 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -1329,7 +1329,7 @@ Italian:"+25% efficacia delle strutture difensive in tutte le città" Simplified_Chinese:"所有城市防御建筑建造速度+25%" French:"Les batiments de défense sont 25% plus efficace dans toutes les villes" - Polski:"+25% skuteczności budowli obronnych w miastach" + Polish:"+25% skuteczności budowli obronnych w miastach" Russian:"Защитные сооружения во всех городах на 25% эффективнее" } diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index 9edc483d90..d075839c51 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -574,7 +574,7 @@ French:"À quoi pensez-vous?" Romanian:"La ce te gândești?" Spanish:"¿Qué tienes en mente?" - Simplified_Chinese:"你有什么想法?" + Simplified_Chinese:"你有什么想法？" Portuguese:"O que tens em mente?" //tens as in have or has nor tens of thousands of course German:"Was schwebt Ihnen vor?" } diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index e50e060de9..0099c8fbbe 100644 --- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json +++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json @@ -647,6 +647,10 @@ Russian:"Автопроизводство в городах" } + "Show minimap":{ + Simplified_Chinese:"显示小地图" + } + "Fontset":{ Italian:"Fontset" Simplified_Chinese:"字体设置" diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 3c789a5181..1c15b81904 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -411,7 +411,7 @@ Romanian:"Sigur desființezi unitatea?" Dutch:"Wil je echt deze eenheid opheffen" Spanish:"¿Realmente quieres disolver esta unidad?" - Simplified_Chinese:"您真的想解雇这个单位吗?" + Simplified_Chinese:"您真的想解雇这个单位吗？" Portuguese:"Voçê realmente quer desfazer essa unidade?" German:"Wollen Sie diese Einheit wirklich auflösen?" Japanese:"あなたは本当にこのユニットを解散したいですか？" diff --git a/android/assets/jsons/Translations/Techs.json b/android/assets/jsons/Translations/Techs.json index 4f6204e14e..12da20e47d 100644 --- a/android/assets/jsons/Translations/Techs.json +++ b/android/assets/jsons/Translations/Techs.json @@ -895,7 +895,7 @@ Romanian:"Cine poate ști ce ne rezervă viitorul?" Dutch:"Wie weet wat de toekomst inhoud?" Spanish:"¿Quién sabe qué nos depara el futuro?" - Simplified_Chinese:"谁知道未来会怎样?" + Simplified_Chinese:"谁知道未来会怎样？" Portuguese:"Quem sabe o que o futuro reserva?" German:"Wer weiß was die Zukunft für uns bereithält?" } diff --git a/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json b/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json index 4273b1e21f..a70f016ad4 100644 --- a/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json +++ b/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json @@ -85,7 +85,7 @@ "游戏中解锁政策、科技等带来的很多增益往往只对首都有效，所以首都的发展代表了您的文明的发达程度。" ], [ - "如何选择一个合适的首都建立位置?这不是一个容易回答的问题。", + "如何选择一个合适的首都建立位置？这不是一个容易回答的问题。", "通常情况下，选择紧邻奢侈资源的位置是选择建立点的不二法则。", "奢侈资源主要包括宝石、棉花、丝绸等（这些资源在地图上用一个“笑脸”标示），", "开发这些资源可以增加您的文明的快乐。当然，你也应该留意那些组建单位时所需要的战略资源，比如铁。" diff --git a/core/src/com/unciv/models/gamebasics/Translations.kt b/core/src/com/unciv/models/gamebasics/Translations.kt index c35f3e2946..cbdf2afa41 100644 --- a/core/src/com/unciv/models/gamebasics/Translations.kt +++ b/core/src/com/unciv/models/gamebasics/Translations.kt @@ -33,7 +33,7 @@ class Translations : HashMap>(){ } fun getLanguages(): List { - val toReturn = mutableListOf("English") + val toReturn = mutableListOf() toReturn.addAll(values.flatMap { it.keys }.distinct()) toReturn.remove("Japanese") return toReturn diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt index 759e05c262..44610dae1a 100644 --- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt @@ -221,7 +221,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){ private fun getCityInfoTable(): Table { - val iconSize = 20f//if you set this too low, there is a chance that the tables will be misaligned + val iconSize = 50f//if you set this too low, there is a chance that the tables will be misaligned val padding = 5f val cityInfoTableIcons = Table(skin) @@ -378,7 +378,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){ .filter { it.resourceType!=ResourceType.Bonus }.distinct().sortedBy { it.resourceType } for(resource in resources) - resourcesTable.add(ImageGetter.getResourceImage(resource.name,30f)) + resourcesTable.add(ImageGetter.getResourceImage(resource.name,50f)) resourcesTable.addSeparator() val origins = resourceDrilldown.map { it.origin }.distinct() From d2ee68429335c078b34a5696a5027b6d1f5e045b Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Wed, 11 Sep 2019 15:33:06 +0800 Subject: [PATCH 2/4] Adjust food and culture weight for AI cities developpment. (#1060) --- core/src/com/unciv/logic/automation/Automation.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/automation/Automation.kt b/core/src/com/unciv/logic/automation/Automation.kt index c951d3bd00..227a8b1e52 100644 --- a/core/src/com/unciv/logic/automation/Automation.kt +++ b/core/src/com/unciv/logic/automation/Automation.kt @@ -5,6 +5,7 @@ import com.unciv.logic.city.CityInfo import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.map.BFS import com.unciv.logic.map.TileInfo +import com.unciv.models.gamebasics.VictoryType import com.unciv.models.gamebasics.unit.BaseUnit import com.unciv.models.gamebasics.unit.UnitType import com.unciv.models.stats.Stats @@ -38,7 +39,7 @@ class Automation { rank += stats.gold / 5 // it's barely worth anything at this points } else{ - if (stats.food <= 2) rank += (stats.food * 1.2f) //food get more value to keep city growing + if (stats.food <= 2 || city.civInfo.getHappiness() > 5) rank += (stats.food * 1.2f) //food get more value to keep city growing else rank += (2.4f + (stats.food - 2) / 2) // 1.2 point for each food up to 2, from there on half a point if (city.civInfo.gold < 0 && city.civInfo.statsForNextTurn.gold <= 0) rank += stats.gold // we have a global problem @@ -46,7 +47,12 @@ class Automation { rank += stats.production rank += stats.science - rank += stats.culture + if (city.tiles.size < 12 || city.civInfo.victoryType() == VictoryType.Cultural){ + rank += stats.culture + } + else{ + rank += stats.culture / 2 + } } return rank } From 548b1a96d048f9cf846ed3923bc59f4e28f9b799 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Wed, 11 Sep 2019 14:45:00 +0800 Subject: [PATCH 3/4] Fix statue of liberity affect. --- core/src/com/unciv/logic/city/CityStats.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index f96265d056..c8384e9dd9 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -228,7 +228,7 @@ class CityStats { if (policies.contains("Commerce Complete")) stats.gold += 1 if (policies.contains("Secularism")) stats.science += 2 - if (cityInfo.containsBuildingUnique("+1 Production from specialists")) + if (cityInfo.civInfo.containsBuildingUnique("+1 Production from specialists")) stats.production += 1 if(cityInfo.civInfo.nation.unique=="+2 Science for all specialists and Great Person tile improvements") stats.science+=2 From 7578cf4bbcfae528e3c164e1a33bbf2b64a28df8 Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Wed, 11 Sep 2019 10:22:40 +0200 Subject: [PATCH 4/4] Update Units,Promotions.json (#1061) * Update Units,Promotions.json Missing Italian Translation, and I think I accidentally deleted the Spanish translation for Turtle Ship * Update Units,Promotions.json --- android/assets/jsons/Translations/Units,Promotions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index abc4e74622..3398169971 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -671,7 +671,8 @@ } "Turtle Ship":{ - Spanish:"Nave tartaruga" + Italian:"Nave tartaruga" + Spanish:"Nave tartaruga"//Should be "Barco tortuga" Simplified_Chinese:"龟船" Russian:"Кобуксон" }