From 5f43c93846d9da1f104387763856981fc1c5b442 Mon Sep 17 00:00:00 2001 From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com> Date: Fri, 13 Sep 2019 00:42:29 +0800 Subject: [PATCH 1/5] MrUldiggg delete some words which are necessary. please update immediately (#1069) 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" * 显示教程 * update * update * update --- android/assets/jsons/Nations.json | 4 +++- android/assets/jsons/Translations/Notifications.json | 2 ++ android/assets/jsons/Translations/Other.json | 2 +- core/src/com/unciv/ui/utils/Fonts.kt | 8 ++++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index 6eb888be3e..05763358ed 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -531,7 +531,9 @@ hateYes:["Hm... very well, fine.","I suppose I should agree...","Very well..."] afterPeace:"It seems you implemented some interesting strategies... Very well, perhaps we should call it a tie." - tradeRequest:"We have many things to discuss and have much to benefit from each other.", + tradeRequest:"We have many things to discuss and have much to benefit from each other." + + outerColor:[20,25,73], innerColor:[187,33,51], uniqueName:"Scholars of the Jade Hall" unique:"+2 Science for all specialists and Great Person tile improvements", diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json index bbd3f5e2cc..61a1d2a51e 100644 --- a/android/assets/jsons/Translations/Notifications.json +++ b/android/assets/jsons/Translations/Notifications.json @@ -574,10 +574,12 @@ "[nation] agreed to stop settling cities near us!": { Italian:"[nation] ha promesso di smettere di fondare città vicino a noi!" + Simplified_Chinese:"[nation]同意停止在我们附近建城！" }, "[nation] refused to stop settling cities near us!": { Italian:"[nation] ha rifiutato di smettere di fondare città vicino a noi!" + Simplified_Chinese:"[nation]拒绝停止在我们附近建城！" }, } diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 1c15b81904..1a2dd8c765 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -45,7 +45,7 @@ German:"in" Dutch:"in" Spanish:"en" - Simplified_Chinese:"建造/组建完成还需" + Simplified_Chinese:"建造/组建完成需" Portuguese:"em" Japanese:"に" } diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/utils/Fonts.kt index 36b477bfa2..804723229f 100644 --- a/core/src/com/unciv/ui/utils/Fonts.kt +++ b/core/src/com/unciv/ui/utils/Fonts.kt @@ -88,10 +88,10 @@ class Fonts { Gdx.files.local("fonts/$fontForLanguage.ttf").delete() UnCivGame.Current.settings.fontSet="NativeFont(Recommended)" Gdx.app.postRunnable { - val downloading = PopupTable(UnCivGame.Current.worldScreen) - downloading.add("Checksum error!\nIf you want to use the font \"WenQuanYiMicroHei\", please download again.".toLabel().setFontColor(Color.RED)).row() - downloading.addButton("Close".tr()) { downloading.remove() }.row() - downloading.open() + val checksumFailed = PopupTable(UnCivGame.Current.worldScreen) + checksumFailed.add("Checksum error!\nIf you want to use the font \"WenQuanYiMicroHei\", please download again.".toLabel().setFontColor(Color.RED)).row() + checksumFailed.addButton("Close".tr()) { checksumFailed.remove() }.row() + checksumFailed.open() } } else { From 00f66a785f4bed4ddbd3cbaed8aef33e38a0640f Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:43:00 +0200 Subject: [PATCH 2/5] Nubian Pitati Archer and Australian Digger --- android/assets/jsons/Units.json | 68 ++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index b67d3e9083..702cdbdc85 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -130,6 +130,22 @@ attackSound:"arrow" //Incan unique unit }, + { + //Nubian Unique Unit, stronger and faster than Archer + name:"Pitati Archer", + unitType:"Ranged", + replaces:"Archer", + uniqueTo:"Nubia", + movement:3, + strength:6, + rangedStrength:9, + cost: 50, + hurryCostModifier:20, + requiredTech:"Archery", + obsoleteTech:"Machinery",//Should be Construction + upgradesTo:"Crossbowman",//Should be Composite Bowman + attackSound:"arrow" + }, */ { name:"Work Boats", @@ -834,6 +850,23 @@ hurryCostModifier:20, attackSound:"shot" }, + /* + { + name:"Norvegian Ski Infantry", + unitType:"Melee", + replaces:"Rifleman", + uniqueTo:"Denmark", + movement:2, + strength:34, + cost: 225, + requiredTech:"Rifling", + obsoleteTech:"Replaceable Parts", + upgradesTo:"Great War Infantry", + uniques:["Bonus in Snow, Tundra and Hills"], + hurryCostModifier:20, + attackSound:"shot" + }, + */ { name:"Triplane", unitType:"Fighter", @@ -866,24 +899,6 @@ hurryCostModifier:20, attackSound:"shot" }, - - /* - { - name:"Norvegian Ski Infantry", - unitType:"Melee", - replaces:"Rifleman", - uniqueTo:"Denmark", - movement:2, - strength:34, - cost: 225, - requiredTech:"Rifling", - obsoleteTech:"Replaceable Parts", - upgradesTo:"Great War Infantry", - uniques:["Bonus in Snow, Tundra and Hills"], - hurryCostModifier:20, - attackSound:"shot" - }, - */ { name:"Cavalry", unitType:"Mounted", @@ -1089,6 +1104,23 @@ hurryCostModifier:20, attackSound:"shot" }, + /* + { + name:"Digger", + unitType:"Melee", + replaces:"Infantry", + uniqueTo:"Australia", + movement:2, + strength:72, + cost: 375, + requiredTech:"Plastics", + upgradesTo:"Mechanized Infantry", + obsoleteTech:"Mobile Tactics", + uniques:["+20% Strenght on Coast tiles","+10% Strenght outside Australian territory"], + hurryCostModifier:20, + attackSound:"shot" + }, + */ { name:"Machine Gun", unitType:"Ranged", From dbdf2d819fd099df597bf51611776f65d253d5e6 Mon Sep 17 00:00:00 2001 From: Smashfanful <41149920+Smashfanful@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:46:25 +0200 Subject: [PATCH 3/5] Australian Outback Station --- android/assets/jsons/Buildings.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index 6b62b13840..abbdc98779 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -619,6 +619,21 @@ uniques:["Must not be on hill"], requiredTech:"Economics" }, + /* + { + name:"Outback Station", + replaces:"Windmill", + uniqueTo:"Australia", + production:2, + food:1, + specialistSlots:{production:1}, + hurryCostModifier:25, + maintenance:2, + percentStatBonus:{production:10}, + uniques:["Must not be on hill","+1 Food from every Pasture near the City"], + requiredTech:"Economics" + }, + */ // Industrial Era From fe3cd222ef52a3d3634e153d5ed7787303f908f9 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 12 Sep 2019 19:46:00 +0300 Subject: [PATCH 4/5] Revert "Australian Outback Station" This reverts commit dbdf2d819fd099df597bf51611776f65d253d5e6. --- android/assets/jsons/Buildings.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index abbdc98779..6b62b13840 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -619,21 +619,6 @@ uniques:["Must not be on hill"], requiredTech:"Economics" }, - /* - { - name:"Outback Station", - replaces:"Windmill", - uniqueTo:"Australia", - production:2, - food:1, - specialistSlots:{production:1}, - hurryCostModifier:25, - maintenance:2, - percentStatBonus:{production:10}, - uniques:["Must not be on hill","+1 Food from every Pasture near the City"], - requiredTech:"Economics" - }, - */ // Industrial Era From 656c94a2a3c0fa2c51fcc47e79bbded37fd93764 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 12 Sep 2019 19:46:46 +0300 Subject: [PATCH 5/5] Revert "Nubian Pitati Archer and Australian Digger" This reverts commit 00f66a785f4bed4ddbd3cbaed8aef33e38a0640f. --- android/assets/jsons/Units.json | 68 +++++++++------------------------ 1 file changed, 18 insertions(+), 50 deletions(-) diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 702cdbdc85..b67d3e9083 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -130,22 +130,6 @@ attackSound:"arrow" //Incan unique unit }, - { - //Nubian Unique Unit, stronger and faster than Archer - name:"Pitati Archer", - unitType:"Ranged", - replaces:"Archer", - uniqueTo:"Nubia", - movement:3, - strength:6, - rangedStrength:9, - cost: 50, - hurryCostModifier:20, - requiredTech:"Archery", - obsoleteTech:"Machinery",//Should be Construction - upgradesTo:"Crossbowman",//Should be Composite Bowman - attackSound:"arrow" - }, */ { name:"Work Boats", @@ -850,23 +834,6 @@ hurryCostModifier:20, attackSound:"shot" }, - /* - { - name:"Norvegian Ski Infantry", - unitType:"Melee", - replaces:"Rifleman", - uniqueTo:"Denmark", - movement:2, - strength:34, - cost: 225, - requiredTech:"Rifling", - obsoleteTech:"Replaceable Parts", - upgradesTo:"Great War Infantry", - uniques:["Bonus in Snow, Tundra and Hills"], - hurryCostModifier:20, - attackSound:"shot" - }, - */ { name:"Triplane", unitType:"Fighter", @@ -899,6 +866,24 @@ hurryCostModifier:20, attackSound:"shot" }, + + /* + { + name:"Norvegian Ski Infantry", + unitType:"Melee", + replaces:"Rifleman", + uniqueTo:"Denmark", + movement:2, + strength:34, + cost: 225, + requiredTech:"Rifling", + obsoleteTech:"Replaceable Parts", + upgradesTo:"Great War Infantry", + uniques:["Bonus in Snow, Tundra and Hills"], + hurryCostModifier:20, + attackSound:"shot" + }, + */ { name:"Cavalry", unitType:"Mounted", @@ -1104,23 +1089,6 @@ hurryCostModifier:20, attackSound:"shot" }, - /* - { - name:"Digger", - unitType:"Melee", - replaces:"Infantry", - uniqueTo:"Australia", - movement:2, - strength:72, - cost: 375, - requiredTech:"Plastics", - upgradesTo:"Mechanized Infantry", - obsoleteTech:"Mobile Tactics", - uniques:["+20% Strenght on Coast tiles","+10% Strenght outside Australian territory"], - hurryCostModifier:20, - attackSound:"shot" - }, - */ { name:"Machine Gun", unitType:"Ranged",